update the ups shipping module in v2.0

CHANGELOG for v0.1.x.md → CHANGELOG for v2.0.0.md

@@ -1,8 +1,8 @@
-# CHANGELOG for v0.1.x
+# CHANGELOG for v2.0.0
 
 #### This changelog consists the bug & security fixes and new features being included in the releases listed below.
 
-## **v0.1.0(23 of Feb, 2020)** - *Release*
+## **v2.0.0** - *Development*
 
 * [feature] The admin can enable or disable the usps Shipping method.
 

README.md

@@ -45,11 +45,7 @@ composer dump-autoload
 ~~~
 
 ~~~
-php artisan route:cache
-~~~
-
-~~~
-php artisan config:clear
+php artisan optimize:clear
 ~~~
 
 ~~~

packages/Webkul/UpsShipping/.gitignore

@@ -0,0 +1,3 @@
+/node_modules
+/npm-debug.log
+/package-lock.json

composer.json → packages/Webkul/UpsShipping/composer.json

@@ -1,18 +1,13 @@
 {
-    "name": "bagisto/bagisto-ups-shipping",
+    "name": "bagisto/laravel-ups",
     "license": "MIT",
     "authors": [
         {
-            "name": "Naresh Verma",
-            "email": "[email protected]"
-        },  {
-            "name": "Vivek Sharma",
-            "email": "[email protected]"
+            "name": "Bagisto",
+            "email": "[email protected]"
         }
     ],
-    "require": {
-        "konekt/concord": "^1.2"
-    },
+    "require": {},
     "autoload": {
         "psr-4": {
             "Webkul\\UpsShipping\\": "src/"
@@ -27,4 +22,4 @@
         }
     },
     "minimum-stability": "dev"
-}
+}

packages/Webkul/UpsShipping/package.json

@@ -0,0 +1,13 @@
+{
+  "private": true,
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "axios": "^1.4.0",
+    "laravel-vite-plugin": "^0.7.2",
+    "postcss": "^8.4.23",
+    "vite": "^4.0.0"
+  }
+}

packages/Webkul/UpsShipping/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+    plugins: {
+        tailwindcss: {},
+        autoprefixer: {},
+    },
+};

src/Carriers/Ups.php → packages/Webkul/UpsShipping/src/Carriers/Ups.php

@@ -2,25 +2,37 @@
 
 namespace Webkul\UpsShipping\Carriers;
 
+use Webkul\Checkout\Facades\Cart;
 use Webkul\Checkout\Models\CartShippingRate;
 use Webkul\Shipping\Carriers\AbstractShipping;
 use Webkul\UpsShipping\Helpers\ShippingMethodHelper;
-use Webkul\Checkout\Facades\Cart;
 
 class Ups extends AbstractShipping
 {
+    /**
+     * The shipping method helper instance.
+     *
+     * @var \Webkul\UpsShipping\Helpers\ShippingMethodHelper $shippingMethodHelper
+     * @return void
+     */
+    public function __construct(
+        protected ShippingMethodHelper $shippingMethodHelper,
+    )
+    {
+    }
+
     /**
      * Payment method code
      *
      * @var string
      */
-    protected $code  = 'ups';
+    protected $code = 'ups';
 
     /**
-     * Returns rate for ups
+     * Calculate shipping rates.
      *
-     * @return array
-    */
+     * @return array|false
+     */
     public function calculate()
     {
         if (! $this->isAvailable()) {
@@ -30,34 +42,37 @@ public function calculate()
         $shippingMethods = $rates = [];
 
         $cart = Cart::getCart();
-
+        
         $address = $cart->shipping_address;
-
-        $cartProducts = app(ShippingMethodHelper::class)->getAllCartProducts($address);
+      
+        $data = $this->shippingMethodHelper->getAllCartProducts($address);
 
         $marketplaceShipping = session()->get('marketplace_shipping_rates');
 
-        if (isset($cartProducts)) {
-            foreach ($cartProducts as $key => $fedexServices) {
+        if (! $this->isAvailable())
+            return false;
+
+        if (isset ($data) && $data == true) {
+            foreach ($data as $key => $fedexServices) {
                 $rate = $totalShippingCost = 0;
-                $upsMethod = $methodCode = $key;
+
+                $upsMethod =  $methodCode = $key;
 
                 foreach ($fedexServices as $methods => $upsRate) {
                     $rate += $upsRate['rate'] * $upsRate['itemQuantity'];
-
                     $sellerId = $upsRate['marketplace_seller_id'];
 
-                    $itemShippingCost = $upsRate['rate'] * $upsRate['itemQuantity'];
+                    $itemShippingCost =  $upsRate['rate'] * $upsRate['itemQuantity'];
 
                     $rates[$key][$sellerId] = [
                         'amount'      => core()->convertPrice($itemShippingCost),
-                        'base_amount' => $itemShippingCost,
+                        'base_amount' => $itemShippingCost
                     ];
 
-                    if (isset($rates[$key][$sellerId])) {
+                    if (isset ($rates[$key][$sellerId])) {
                         $rates[$key][$sellerId] = [
                             'amount'      => core()->convertPrice($rates[$key][$sellerId]['amount'] + $itemShippingCost),
-                            'base_amount' => $rates[$key][$sellerId]['base_amount'] + $itemShippingCost,
+                            'base_amount' => $rates[$key][$sellerId]['base_amount'] + $itemShippingCost
                         ];
                     }
 
@@ -67,26 +82,33 @@ public function calculate()
                 $object = new CartShippingRate;
 
                 $object->carrier = 'mpups';
+
                 $object->carrier_title = $this->getConfigData('title');
+
                 $object->method = 'mpups_' . '' . $methodCode;
+
                 $object->method_title = $this->getConfigData('title');
+
                 $object->method_description = $upsMethod;
+
                 $object->price = core()->convertPrice($totalShippingCost);
+
                 $object->base_price = $totalShippingCost;
 
                 $marketplaceShippingRates = session()->get('marketplace_shipping_rates');
 
                 if (! is_array($marketplaceShipping)) {
                     $marketplaceShippingRates['mpupsshipping'] = ['mpupsshipping' => $rates];
                     session()->put('marketplace_shipping_rates', $marketplaceShippingRates);
+
                 } else {
                     $marketplaceFedexShipping = ['mpupshipping' => $rates];
                 }
 
                 array_push($shippingMethods, $object);
             }
 
-            if (isset($marketplaceFedexShipping)) {
+            if (isset ($marketplaceFedexShipping)) {
                 session()->put('marketplace_shipping_rates.mpupshipping', $marketplaceFedexShipping);
             }
 

packages/Webkul/UpsShipping/src/Config/carriers.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'ups' => [
+        'code'        => 'ups',
+        'title'       => 'UPS Shipping',
+        'description' => 'UPS Shipping',
+        'active'      => true,
+        'class'       => 'Webkul\UpsShipping\Carriers\Ups',
+    ],
+];