get shipping methods fixx

packages/Sarga/API/Http/Controllers/Checkout.php

@@ -3,9 +3,11 @@
 namespace Sarga\API\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use Sarga\API\Http\Resources\Checkout\CartResource;
 use Sarga\API\Http\Resources\Checkout\CartShippingRateResource;
+use Sarga\API\Http\Resources\Checkout\PickupAddress;
 use Webkul\Checkout\Facades\Cart;
 use Webkul\Checkout\Http\Requests\CustomerAddressForm;
 use Webkul\Payment\Facades\Payment;
@@ -17,6 +19,8 @@ class Checkout extends CheckoutController
     public function shipments(){
         $rates = [];
 
+        Shipping::collectRates();
+
         foreach (Shipping::getGroupedAllShippingRates() as $code => $shippingMethod) {
             $rates[] = [
                 'carrier_title' => $shippingMethod['carrier_title'],
@@ -24,9 +28,10 @@ class Checkout extends CheckoutController
             ];
         }
 
+        $addresses = core()->getCurrentChannel()->inventory_sources()->get();
         return response([
             'rates' => $rates,
-            'pickup_addresses' => core()->getCurrentChannel()->inventory_sources()->get()
+            'pickup_addresses' => PickupAddress::collection($addresses)
         ]);
     }
 

packages/Sarga/API/Http/Controllers/IntegrationController.php

@@ -36,19 +36,6 @@ class IntegrationController extends Controller
         return $product;
     }
 
-
-    public function bulk_upload(){
-
-        $products = json_decode(request()->getContent());
-        Storage::put('scrap/products' . time() . '.txt', request()->getContent());
-
-        foreach ($products as $product){
-
-
-        }
-
-    }
-
     public function create(){
 
         try {

packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Sarga\API\Http\Resources\Checkout;
+
+class PickupAddress extends \Illuminate\Http\Resources\Json\JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this->id,
+            'contact_number' => $this->contact_number,
+            'state' => $this->state,
+            'city' => $this->city,
+            'street' => $this->street,
+        ];
+    }
+}

packages/Sarga/API/Http/routes.php

@@ -84,29 +84,35 @@ Route::group(['prefix' => 'api'], function () {
              * Customer cart routes.
              */
             Route::get('cart', [Carts::class, 'get']);
+
             Route::post('cart/add/{productId}', [Carts::class, 'add']);
+
             Route::put('cart/update', [Carts::class, 'update']);
+
             Route::delete('cart/remove/{cartItemId}', [Carts::class, 'removeItem']);
+
             Route::delete('cart/empty', [Carts::class, 'empty']);
+
             Route::post('cart/move-to-wishlist/{cartItemId}', [Carts::class, 'moveToWishlist']);
+
             Route::post('cart/coupon', [Carts::class, 'applyCoupon']);
+
             Route::delete('cart/coupon', [Carts::class, 'removeCoupon']);
 
-        });
-    });
-
-    Route::group(['prefix' =>'checkout'], function (){
-        Route::get('shipments', [Checkout::class, 'shipments']);
-
-        Route::group(['middleware' => ['auth:sanctum', 'sanctum.customer']], function () {
             /**
              * Customer checkout routes.
              */
-            Route::post('save-address', [Checkout::class, 'saveAddress']);
-            Route::post('save-shipping', [Checkout::class, 'saveShipping']);
-            Route::post('save-payment', [Checkout::class, 'savePayment']);
-            Route::post('check-minimum-order', [Checkout::class, 'checkMinimumOrder']);
-            Route::post('save-order', [Checkout::class, 'saveOrder']);
+            Route::get('checkout/shipments', [Checkout::class, 'shipments']);
+
+            Route::post('checkout/save-address', [Checkout::class, 'saveAddress']);
+
+            Route::post('checkout/save-shipping', [Checkout::class, 'saveShipping']);
+
+            Route::post('checkout/save-payment', [Checkout::class, 'savePayment']);
+
+            Route::post('checkout/check-minimum-order', [Checkout::class, 'checkMinimumOrder']);
+
+            Route::post('checkout/save-order', [Checkout::class, 'saveOrder']);
         });
     });
 });

packages/Sarga/Admin/src/Providers/AdminServiceProvider.php

@@ -40,5 +40,9 @@ class AdminServiceProvider extends ServiceProvider
             dirname(__DIR__) . '/Config/system.php',
             'core'
         );
+
+        $this->mergeConfigFrom(
+            dirname(__DIR__) . '/Config/carriers.php', 'carriers'
+        );
     }
 }