feat: Introduce wholesale and attribute pricing to product resources, refactor multiple order processing logic, and update seller authentication cookie handling.

Author: Level237

app/Http/Controllers/Auth/LoginController.php

@@ -57,8 +57,8 @@ public function login(Request $request){
         $cookieNameAccess = 'accessTokenDelivery';
         $cookieNameRefresh = 'refreshTokenDelivery';
     } else if (str_contains($origin, 'localhost')) {
-        $cookieNameAccess = 'accessToken';
-        $cookieNameRefresh = 'refreshToken';
+        $cookieNameAccess = 'accessTokenSeller';
+        $cookieNameRefresh = 'refreshTokenSeller';
     } else {
         $cookieNameAccess = 'accessToken';
         $cookieNameRefresh = 'refreshToken';

app/Http/Controllers/Seller/ProductController.php

@@ -270,9 +270,8 @@ public function update(Request $request, $id)
 {
     try {
         DB::beginTransaction();
-
         // Log de la requête entrante
-        Log::info('Product update request received', ['product_id' => $id, 'request_all' => $request->all()]);
+        Log::info('Product update request received', ['product_id' => $id, 'request_all' => $request]);
 
         $user = Auth::guard('api')->user();
         $shop = Shop::where('user_id', $user->id)->first();

app/Http/Middleware/AttachAccessTokenFromCookieUser.php

@@ -17,7 +17,7 @@ public function handle(Request $request, Closure $next)
         } elseif (str_contains($host, 'delivery.akevas.com')) {
             $cookieName = 'accessTokenDelivery';
         } elseif (str_contains($host, 'localhost:5173')) {
-            $cookieName = 'accessToken';
+            $cookieName = 'accessTokenSeller';
         } 
         else {
             $cookieName = 'accessToken'; // client / admin

app/Http/Resources/ProductAttributeResource.php

@@ -22,6 +22,7 @@ public function toArray(Request $request): array
         return [
             'id' => $this->id,
             'value' => $this->attributeValue->value,
+            'price'=>$this->price,
             "product_variation"=>ProductVariationResource::make($this->variation),
         ];
     }

app/Http/Resources/ProductVariationResource.php

@@ -32,6 +32,8 @@ public function toArray(Request $request): array
             'price' => $this->price,
             'quantity' => $this->quantity,
             'images' => ImageResource::collection($this->images),
+            'isWhole' => $this->product->wholesalePrices ? true : false,
+            "wholeSalePrice" => $this->product->wholesalePrices,
             'attributes_variation' => $this->attributesVariation->map(function($attr) {
                 return [
                     'id' => $attr->id,

app/Jobs/PaymentProcessingJob.php

@@ -70,7 +70,10 @@ public function handle(): void
 
         if (isset($responseStatus) && $responseStatus === "FAILED" || $responseStatus === "CANCELED") {
             Log::error('PaymentProcessingJob: Payment failed');
-            
+             Log::info('PaymentProcessingJob: Payment processing for job', [
+                "app" => $this->request,
+                "reference" => $this->reference,
+            ]);
             return;
         }
 

app/Services/Payment/ValidatePaymentProductService.php

@@ -136,8 +136,8 @@ private function createOrder($userId,$amount,$shipping,$productId,$quantity,$qua
 
 private function multipleOrder($userId,$amount,$shipping,$quarter_delivery,$address,$productsPayments,$reference){
 
-        foreach($productsPayments as $product){
-            $order=new Order;
+
+         $order=new Order;
             $order->user_id=$userId;
             $order->isPay=1;
             $order->total=$amount;
@@ -150,9 +150,13 @@ private function multipleOrder($userId,$amount,$shipping,$quarter_delivery,$addr
                 $order->address=$address;
             }
             $order->save();
-            SendNewOrderNotificationJob::dispatch($order->id,$product['product_id'])->delay(now()->addMinutes(1));
+
             $this->savePaymentAndOrder($reference,$order->id);
-         if($product['hasVariation']=="true"){
+        foreach($productsPayments as $product){
+           
+            SendNewOrderNotificationJob::dispatch($order->id,$product['product_id'])->delay(now()->addMinutes(1));
+            
+         if($product['hasVariation']==true){
              $orderVariation=new OrderVariation;
              $orderVariation->order_id=$order->id;
              if($product['attributeVariationId']==null){
@@ -169,6 +173,12 @@ private function multipleOrder($userId,$amount,$shipping,$quarter_delivery,$addr
              Log::info('Order variation create success');
              $orderVariation->save();
          }else{
+            Log::info('gain order',[
+                "order_id"=>$order->id,
+                "product_id"=>$product['product_id'],
+                "quantity"=>$product['quantity'],
+                "price"=>$product['price'],
+            ]);
              $orderDetails=new OrderDetail;
              $orderDetails->order_id=$order->id;
              $orderDetails->product_id=$product['product_id'];
@@ -181,9 +191,9 @@ private function multipleOrder($userId,$amount,$shipping,$quarter_delivery,$addr
              }
          }
 
-       return $order;
+       
     }
-    return null;
+    return $order;
 }
 
 private function reduceQuantity($productId,$quantity){

config/cors.php

@@ -17,7 +17,7 @@
 
      'paths' => ['api/*'],
 
-    'allowed_methods' => ['GET, POST, PUT, DELETE, OPTIONS'],
+    'allowed_methods' => ['GET, POST, PUT, DELETE, OPTIONS','PATCH'],
 
     'allowed_origins' => ['http://localhost:5173',"https://delivery.akevas.com","https://seller.akevas.com","https://main.akevas.com","https://www.main.akevas.com","https://akevas.com","https://www.akevas.com","https://pay.notchpay.co","https://dev.akevas.com","http://localhost:4173",'http://localhost:5174'],
 

routes/api.php

@@ -96,7 +96,6 @@
 use App\Http\Controllers\Product\Payment\PaymentProductProcessingController;
 use App\Http\Controllers\Shops\ListReviewController as ShopReviewController;
 use App\Http\Controllers\Admin\Reviews\DeclineOrValidateShopReviewController;
-use App\Http\Controllers\Payment\Coolpay\Product\BuyProductProcessController;
 use App\Http\Controllers\Product\Payment\HandleWebhookProductPaymentController;
 use App\Http\Controllers\Delivery\ProfileController as DeliveryProfileController;
 use App\Http\Controllers\Admin\RecentOrderController as AdminRecentOrderController;
@@ -266,10 +265,9 @@
 
 Route::middleware(['auth:api'])->prefix('v1')->group(function () {
     Route::get('/orders/towns', [GetOrderOfTownController::class, 'getOrdersByTown']);
-    Route::get('init/pay/coolpay',[BuyProductProcessController::class,'initPaymentCoolpay']);
+    //Route::get('init/pay/coolpay',[BuyProductProcessController::class,'initPaymentCoolpay']);
     Route::post("init/payment/buy/product", [InitPaymentController::class, "initPayment"]);
-    Route::post("payment/pending/buy/product", [BuyProductProcessController::class, "paymentPending"]);
-    Route::post("payment/callback/buy/product", [BuyProductProcessController::class, "buyProductCallBack"]);
+    
     Route::get('/current/user', [ProfileController::class, 'currentUser']);
     Route::post('/update/user', [ProfileController::class, 'updateUser']);
     Route::post('/logout', [LogoutController::class, 'logout']);