NASER fix conflicts

2026-02-16 10:24:21 +00:00
parent ba8e2950e4 a0a788ce53
commit 1250f18c88
12 changed files with 238 additions and 71 deletions
@@ -15,14 +15,24 @@ use App\Http\Controllers\Customer\PriceTriggerController;
 use App\Http\Controllers\Finance\FinanceController;
 use App\Http\Controllers\Admin\ProductController;
 use App\Http\Controllers\Admin\TahesabController;
+<<<<<<< HEAD
 use App\Http\Controllers\Admin\FileController;
 use App\Http\Controllers\Site\OfferCodesController;
+=======
+use App\Http\Controllers\Admin\SettingsController;
+
+>>>>>>> a0a788ce53f1b3dff84bd16f3b7db585071bc159

 Route::middleware('auth:user')->group(function (){
    Route::middleware('validation')->group(function (){
        Route::get('/p', function () {
            return Http::get('https://pricing.liman.gold/pricingApi', [])->json();
        });
+
+        //settigs
+        Route::get('get_settings',[SettingsController::class, 'index']);
+        Route::post('get_settings',[SettingsController::class, 'edit']);
+
        //------------balence
        Route::post('getBalance', [DashboardController::class, 'getBalance']);
        //------------PriceTrigger
@@ -135,15 +145,5 @@ Route::middleware('auth:user')->group(function (){
            return "OK";
        }
        );
-
-        //file
-        Route::post('/file',[FileController::class, 'store']);
-
-        //Offer codes
-        Route::post('/offer_code/table',[OfferCodesController::class, 'table']);
-        Route::post('/offer_code',[OfferCodesController::class, 'store']);
-        Route::resource('/offer_code',OfferCodesController::class);
-
-
    });
    });