From 2a5e8b1dddb31c47d26ce32a5c80f846444b4e25 Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 27 Jun 2019 13:01:47 +0530 Subject: [PATCH] Removed propaganistas/laravel-intl dependency --- composer.json | 1 - config/app.php | 1 - .../Http/Resources/Checkout/CartAddress.php | 2 +- .../Resources/Customer/CustomerAddress.php | 2 +- .../API/Http/Resources/Sales/OrderAddress.php | 2 +- .../Resources/views/sales/address.blade.php | 2 +- .../views/sales/invoices/pdf.blade.php | 4 +-- packages/Webkul/Core/src/Core.php | 34 ++++++++++++++----- .../views/checkout/onepage/review.blade.php | 4 +-- .../customers/account/address/index.blade.php | 2 +- .../customers/account/orders/pdf.blade.php | 4 +-- .../emails/sales/new-admin-order.blade.php | 4 +-- .../new-inventorysource-shipment.blade.php | 4 +-- .../views/emails/sales/new-invoice.blade.php | 4 +-- .../views/emails/sales/new-order.blade.php | 4 +-- .../views/emails/sales/new-shipment.blade.php | 4 +-- 16 files changed, 46 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index e4e0e4b2f..8c75fbb5f 100755 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "maatwebsite/excel": "3.1.x-dev", "nwidart/laravel-modules": "^3.2", "prettus/l5-repository": "^2.6", - "propaganistas/laravel-intl": "^2.0", "tymon/jwt-auth": "dev-develop" }, "require-dev": { diff --git a/config/app.php b/config/app.php index b15029bdc..5b7dd6c55 100755 --- a/config/app.php +++ b/config/app.php @@ -203,7 +203,6 @@ return [ */ Dimsav\Translatable\TranslatableServiceProvider::class, - Propaganistas\LaravelIntl\IntlServiceProvider::class, /* * Application Service Providers... diff --git a/packages/Webkul/API/Http/Resources/Checkout/CartAddress.php b/packages/Webkul/API/Http/Resources/Checkout/CartAddress.php index 65ee44f08..1bed8697c 100644 --- a/packages/Webkul/API/Http/Resources/Checkout/CartAddress.php +++ b/packages/Webkul/API/Http/Resources/Checkout/CartAddress.php @@ -22,7 +22,7 @@ class CartAddress extends JsonResource 'email' => $this->email, 'address1' => explode(PHP_EOL, $this->address1), 'country' => $this->country, - 'country_name' => country()->name($this->country), + 'country_name' => core()->country_name($this->country), 'state' => $this->state, 'city' => $this->city, 'postcode' => $this->postcode, diff --git a/packages/Webkul/API/Http/Resources/Customer/CustomerAddress.php b/packages/Webkul/API/Http/Resources/Customer/CustomerAddress.php index c22e9b9ed..3b792e195 100644 --- a/packages/Webkul/API/Http/Resources/Customer/CustomerAddress.php +++ b/packages/Webkul/API/Http/Resources/Customer/CustomerAddress.php @@ -18,7 +18,7 @@ class CustomerAddress extends JsonResource 'id' => $this->id, 'address1' => explode(PHP_EOL, $this->address1), 'country' => $this->country, - 'country_name' => country()->name($this->country), + 'country_name' => core()->country_name($this->country), 'state' => $this->state, 'city' => $this->city, 'postcode' => $this->postcode, diff --git a/packages/Webkul/API/Http/Resources/Sales/OrderAddress.php b/packages/Webkul/API/Http/Resources/Sales/OrderAddress.php index e21e45b10..bb18a5a6a 100644 --- a/packages/Webkul/API/Http/Resources/Sales/OrderAddress.php +++ b/packages/Webkul/API/Http/Resources/Sales/OrderAddress.php @@ -21,7 +21,7 @@ class OrderAddress extends JsonResource 'last_name' => $this->last_name, 'address1' => explode(PHP_EOL, $this->address1), 'country' => $this->country, - 'country_name' => country()->name($this->country), + 'country_name' => core()->country_name($this->country), 'state' => $this->state, 'city' => $this->city, 'postcode' => $this->postcode, diff --git a/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php index 97489eebb..1bf6bffe2 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php @@ -2,5 +2,5 @@ {{ $address->address1 }}
{{ $address->city }}
{{ $address->state }}
-{{ country()->name($address->country) }} {{ $address->postcode }}

+{{ core()->country_name($address->country) }} {{ $address->postcode }}

{{ __('shop::app.checkout.onepage.contact') }} : {{ $address->phone }} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php index 020ca4384..8e481faa9 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php @@ -114,7 +114,7 @@

{{ $invoice->order->billing_address->address1 }}

{{ $invoice->order->billing_address->city }}

{{ $invoice->order->billing_address->state }}

-

{{ country()->name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}

+

{{ core()->country_name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}

{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->billing_address->phone }} @@ -122,7 +122,7 @@

{{ $invoice->order->shipping_address->address1 }}

{{ $invoice->order->shipping_address->city }}

{{ $invoice->order->shipping_address->state }}

-

{{ country()->name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}

+

{{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}

{{ __('shop::app.checkout.onepage.contact') }} : {{ $invoice->order->shipping_address->phone }} diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 861fd674f..8ff4aa314 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -394,9 +394,9 @@ class Core if (is_null($amount)) $amount = 0; - $currencyCode = $this->getCurrentCurrency()->code; + $formater = new \NumberFormatter( app()->getLocale(), \NumberFormatter::CURRENCY ); - return currency($this->convertPrice($amount), $currencyCode); + return $formater->formatCurrency($this->convertPrice($amount), $this->getCurrentCurrency()->code); } /** @@ -407,11 +407,10 @@ class Core */ public function currencySymbol($code) { - try { - return currency()->symbol($code); - } catch (\Exception $e) { - return $code; - } + + $formatter = new \NumberFormatter(app()->getLocale() . '@currency=' . $code, \NumberFormatter::CURRENCY); + + return $formatter->getSymbol(\NumberFormatter::CURRENCY_SYMBOL); } /** @@ -425,7 +424,9 @@ class Core if (is_null($price)) $price = 0; - return currency($price, $currencyCode); + $formater = new \NumberFormatter( app()->getLocale(), \NumberFormatter::CURRENCY ); + + return $formater->formatCurrency($price, $currencyCode); } /** @@ -438,8 +439,10 @@ class Core { if (is_null($price)) $price = 0; + + $formater = new \NumberFormatter( app()->getLocale(), \NumberFormatter::CURRENCY ); - return currency($price, $this->getBaseCurrencyCode()); + return $formater->formatCurrency($price, $this->getBaseCurrencyCode()); } /** @@ -616,6 +619,19 @@ class Core return $this->countryRepository->all(); } + /** + * Returns country name by code + * + * @param string $code + * @return string + */ + public function country_name($code) + { + $country = $this->countryRepository->findOneByField('code', $code); + + return $country ? $country->name : ''; + } + /** * Retrieve all country states * diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index d696a7e3c..d77d27bc9 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -19,7 +19,7 @@ {{ $billingAddress->address1 }},
{{ $billingAddress->state }}
  • - {{ country()->name($billingAddress->country) }} {{ $billingAddress->postcode }} + {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
    • @@ -47,7 +47,7 @@ {{ $shippingAddress->address1 }},
    {{ $shippingAddress->state }}
  • - {{ country()->name($shippingAddress->country) }} {{ $shippingAddress->postcode }} + {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
    • diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php index cfbf08299..3a397ea24 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php @@ -57,7 +57,7 @@
  • - {{ country()->name($address->country) }} {{ $address->postcode }} + {{ core()->country_name($address->country) }} {{ $address->postcode }}
  • diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php index 4b8b548c3..c5378930e 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php @@ -114,7 +114,7 @@

    {{ $invoice->order->billing_address->address1 }}

    {{ $invoice->order->billing_address->city }}

    {{ $invoice->order->billing_address->state }}

    -

    {{ country()->name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}

    +

    {{ core()->country_name($invoice->order->billing_address->country) }} {{ $invoice->order->billing_address->postcode }}

    {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->billing_address->phone }} @@ -122,7 +122,7 @@

    {{ $invoice->order->shipping_address->address1 }}

    {{ $invoice->order->shipping_address->city }}

    {{ $invoice->order->shipping_address->state }}

    -

    {{ country()->name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}

    +

    {{ core()->country_name($invoice->order->shipping_address->country) }} {{ $invoice->order->shipping_address->postcode }}

    {{ __('shop::app.customer.account.order.view.contact') }} : {{ $invoice->order->shipping_address->phone }} diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php index c9aa7618b..e5bdd6b27 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php @@ -43,7 +43,7 @@
    - {{ country()->name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
    ---
    @@ -75,7 +75,7 @@
    - {{ country()->name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
    ---
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php index 345115895..4007ab277 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php @@ -44,7 +44,7 @@
    - {{ country()->name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
    ---
    @@ -86,7 +86,7 @@
    - {{ country()->name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
    ---
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php index c5877637a..4e983336e 100755 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php @@ -45,7 +45,7 @@
    - {{ country()->name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
    ---
    @@ -77,7 +77,7 @@
    - {{ country()->name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
    ---
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php index 795887cec..6d0150bd7 100755 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php @@ -43,7 +43,7 @@
    - {{ country()->name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
    ---
    @@ -75,7 +75,7 @@
    - {{ country()->name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
    ---
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php index c24dea6ed..2aa41d4a5 100755 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php @@ -45,7 +45,7 @@
    - {{ country()->name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }}
    ---
    @@ -87,7 +87,7 @@
    - {{ country()->name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }}
    ---