merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into issue-4708

This commit is contained in:
devansh bawari 2021-03-09 10:56:33 +05:30
parent 8d485032f0 e60646b791
commit be80e1d7ab
4 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php
View File

@ -115,7 +115,7 @@ class SmartButtonController extends Controller
'phone_type' => 'MOBILE',
'phone_number' => [
'national_number' => $cart->billing_address->phone,
'national_number' => $this->smartButton->formatPhone($cart->billing_address->phone),
],
],
],
@ -127,28 +127,28 @@ class SmartButtonController extends Controller
'purchase_units' => [
[
'amount' => [
'value' => (float) $cart->sub_total + $cart->tax_total + ($cart->selected_shipping_rate ? $cart->selected_shipping_rate->price : 0) - $cart->discount_amount,
'value' => $this->smartButton->formatCurrencyValue((float) $cart->sub_total + $cart->tax_total + ($cart->selected_shipping_rate ? $cart->selected_shipping_rate->price : 0) - $cart->discount_amount),
'currency_code' => $cart->cart_currency_code,
'breakdown' => [
'item_total' => [
'currency_code' => $cart->cart_currency_code,
'value' => (float) $cart->sub_total,
'value' => $this->smartButton->formatCurrencyValue((float) $cart->sub_total),
],
'shipping' => [
'currency_code' => $cart->cart_currency_code,
'value' => (float) ($cart->selected_shipping_rate ? $cart->selected_shipping_rate->price : 0),
'value' => $this->smartButton->formatCurrencyValue((float) ($cart->selected_shipping_rate ? $cart->selected_shipping_rate->price : 0)),
],
'tax_total' => [
'currency_code' => $cart->cart_currency_code,
'value' => (float) $cart->tax_total,
'value' => $this->smartButton->formatCurrencyValue((float) $cart->tax_total),
],
'discount' => [
'currency_code' => $cart->cart_currency_code,
'value' => (float) $cart->discount_amount,
'value' => $this->smartButton->formatCurrencyValue((float) $cart->discount_amount),
],
],
],
@ -190,7 +190,7 @@ class SmartButtonController extends Controller
$lineItems[] = [
'unit_amount' => [
'currency_code' => $cart->cart_currency_code,
'value' => (float) $item->price,
'value' => $this->smartButton->formatCurrencyValue((float) $item->price),
],
'quantity' => $item->quantity,
'name' => $item->name,

25
packages/Webkul/Paypal/src/Payment/Paypal.php
View File

@ -75,4 +75,29 @@ abstract class Paypal extends Payment
{
return true;
}
/**
* Format a currency value according to paypal's api constraints
*
* @param float|int $long
* @return float
*/
public function formatCurrencyValue($number): float
{
return round((float) $number, 2);
}
/**
* Format phone field according to paypal's api constraints
*
* Strips non-numbers characters like '+' or ' ' in
* inputs like "+54 11 3323 2323"
*
* @param mixed $phone
* @return string
*/
public function formatPhone($phone): string
{
return preg_replace('/[^0-9]/', '', (string) $phone);
}
}

12
packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
View File

@ -299,19 +299,19 @@
changeProductImages: function () {
galleryImages.splice(0, galleryImages.length)
this.galleryImages.forEach(function(image) {
galleryImages.push(image)
});
if (this.simpleProduct) {
this.config.variant_images[this.simpleProduct].forEach(function(image) {
galleryImages.unshift(image)
galleryImages.push(image)
});
this.config.variant_videos[this.simpleProduct].forEach(function(video) {
galleryImages.unshift(video)
galleryImages.push(video)
});
}
this.galleryImages.forEach(function(image) {
galleryImages.push(image)
});
},
changeStock: function (productId) {

4
packages/Webkul/Velocity/src/Resources/views/shop/products/view/configurable-options.blade.php
View File

@ -319,11 +319,11 @@
if (this.simpleProduct) {
this.config.variant_images[this.simpleProduct].forEach(function(image) {
galleryImages.unshift(image)
galleryImages.push(image)
});
this.config.variant_videos[this.simpleProduct].forEach(function(video) {
galleryImages.unshift(video)
galleryImages.push(video)
});
}