diff --git a/packages/Sarga/API/Http/Controllers/Checkout.php b/packages/Sarga/API/Http/Controllers/Checkout.php index 7f695424d..4b5f81f93 100644 --- a/packages/Sarga/API/Http/Controllers/Checkout.php +++ b/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) ]); } diff --git a/packages/Sarga/API/Http/Controllers/IntegrationController.php b/packages/Sarga/API/Http/Controllers/IntegrationController.php index 660cae770..110fdd371 100644 --- a/packages/Sarga/API/Http/Controllers/IntegrationController.php +++ b/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 { diff --git a/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php b/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php new file mode 100644 index 000000000..c186a3816 --- /dev/null +++ b/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php @@ -0,0 +1,23 @@ + $this->id, + 'contact_number' => $this->contact_number, + 'state' => $this->state, + 'city' => $this->city, + 'street' => $this->street, + ]; + } +} \ No newline at end of file diff --git a/packages/Sarga/API/Http/routes.php b/packages/Sarga/API/Http/routes.php index 41c487fbb..298059e23 100644 --- a/packages/Sarga/API/Http/routes.php +++ b/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']); }); }); }); diff --git a/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php b/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php index de27348e8..409dea319 100644 --- a/packages/Sarga/Admin/src/Providers/AdminServiceProvider.php +++ b/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' + ); } }