Skip to content

Commit ae594d0

Browse files
author
antu chaudhary
committed
Added the further changes according to the code standard
1 parent f173202 commit ae594d0

File tree

4 files changed

+194
-188
lines changed

4 files changed

+194
-188
lines changed

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

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,59 +27,63 @@ public function calculate()
2727
return false;
2828
}
2929

30-
$shippingMethods = [];
30+
$shippingRates = [];
3131

3232
$cart = Cart::getCart();
3333

3434
$address = $cart->shipping_address;
3535

36-
$data = app('Webkul\UpsShipping\Helpers\ShippingMethodHelper')->getAllCartProducts($address);
36+
$shippingMethodHelper = app(ShippingMethodHelper::class);
37+
38+
$cartProductsShippingData = $shippingMethodHelper->getAllCartProducts($address);
3739

38-
if (! $data) {
40+
if (! $cartProductsShippingData) {
3941
return false;
4042
}
4143

42-
foreach ($data as $key => $fedexServices) {
44+
foreach ($cartProductsShippingData as $sellerId => $shippingMethods) {
4345
$totalShippingCost = 0;
46+
47+
$sellerRates = [];
4448

45-
$rates = [];
46-
47-
foreach ($fedexServices as $methods => $upsRate) {
48-
$itemShippingCost = $upsRate['rate'] * $upsRate['itemQuantity'];
49-
$sellerId = $upsRate['marketplace_seller_id'];
49+
foreach ($shippingMethods as $methodCode => $methodData) {
50+
$itemShippingCost = $methodData['rate'] * $methodData['itemQuantity'];
51+
$marketplaceSellerId = $methodData['marketplace_seller_id'];
5052

51-
$rates[$sellerId] = [
53+
$sellerRates[$marketplaceSellerId] = [
5254
'amount' => core()->convertPrice($itemShippingCost),
5355
'base_amount' => $itemShippingCost,
5456
];
5557

5658
$totalShippingCost += $itemShippingCost;
5759
}
5860

59-
$object = new CartShippingRate;
61+
$cartShippingRate = new CartShippingRate;
6062

61-
$object->carrier = 'mpups';
63+
$cartShippingRate->carrier = 'mpups';
6264

63-
$object->carrier_title = $this->getConfigData('title');
65+
$cartShippingRate->carrier_title = $this->getConfigData('title');
6466

65-
$object->method = 'mpups_' . $key;
67+
$cartShippingRate->method = 'mpups_' . $sellerId;
6668

67-
$object->method_title = $this->getConfigData('title');
69+
$cartShippingRate->method_title = $this->getConfigData('title');
6870

69-
$object->method_description = $key;
71+
$cartShippingRate->method_description = $sellerId;
7072

71-
$object->price = core()->convertPrice($totalShippingCost);
73+
$cartShippingRate->price = core()->convertPrice($totalShippingCost);
7274

73-
$object->base_price = $totalShippingCost;
75+
$cartShippingRate->base_price = $totalShippingCost;
7476

75-
$shippingMethods[] = $object;
77+
$shippingRates[] = $cartShippingRate;
78+
7679
// Store rates in session
7780
$marketplaceShippingRates = session()->get('marketplace_shipping_rates', []);
7881

79-
$marketplaceShippingRates['mpupsshipping'][$key] = $rates;
82+
$marketplaceShippingRates['mpupsshipping'][$sellerId] = $sellerRates;
83+
8084
session()->put('marketplace_shipping_rates', $marketplaceShippingRates);
8185
}
8286

83-
return $shippingMethods;
87+
return $shippingRates;
8488
}
8589
}

0 commit comments

Comments
 (0)