From bcb5aa960c44f2fb941b0347f47770bf4094255b Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Mon, 19 Apr 2021 03:38:06 +0200 Subject: [PATCH 1/9] Updated admin template --- .../emails/sales/new-admin-order.blade.php | 78 ++++++++++++------- 1 file changed, 48 insertions(+), 30 deletions(-) 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 6009ab0d8..160bd6e5b 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 @@ -33,41 +33,51 @@
-
-
- {{ __('shop::app.mail.order.shipping-address') }} -
+ @if ($order->shipping_address) +
+
+ {{ __('shop::app.mail.order.shipping-address') }} +
-
- {{ $order->shipping_address->company_name ?? '' }} -
+
+ {{ $order->shipping_address->company_name ?? '' }} +
-
- {{ $order->shipping_address->name }} -
+
+ {{ $order->shipping_address->name }} +
-
- {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} -
+
+ {{ $order->shipping_address->address1 }} +
-
- {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} -
+
+ {{ $order->shipping_address->postcode ." " . $order->shipping_address->city }} +
-
---
+
+ {{ $order->shipping_address->state }} +
-
- {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }} -
+
+ {{ core()->country_name($order->shipping_address->country) }} +
-
- {{ __('shop::app.mail.order.shipping') }} -
+
---
-
- {{ $order->shipping_title }} +
+ {{ __('shop::app.mail.order.contact') }} : {{ $order->shipping_address->phone }} +
+ +
+ {{ __('shop::app.mail.order.shipping') }} +
+ +
+ {{ $order->shipping_title }} +
-
+ @endif
@@ -83,11 +93,19 @@
- {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
- {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode ." " . $order->billing_address->city }} +
+ +
+ {{ $order->billing_address->state }} +
+ +
+ {{ core()->country_name($order->billing_address->country) }}
---
@@ -96,11 +114,11 @@ {{ __('shop::app.mail.order.contact') }} : {{ $order->billing_address->phone }}
-
+
{{ __('shop::app.mail.order.payment') }}
-
+
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
From c912dc848f9d2e16e8299de7f2fc5794171818d0 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Mon, 19 Apr 2021 03:38:32 +0200 Subject: [PATCH 2/9] Updated customer template --- .../views/emails/sales/new-order.blade.php | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) 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 2db328e2b..d93827f5d 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 @@ -44,11 +44,19 @@
- {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
- {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode ." " . $order->shipping_address->city }} +
+ +
+ {{ $order->shipping_address->state }} +
+ +
+ {{ core()->country_name($order->shipping_address->country) }}
---
@@ -81,11 +89,19 @@
- {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
- {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode ." " . $order->billing_address->city }} +
+ +
+ {{ $order->billing_address->state }} +
+ +
+ {{ core()->country_name($order->billing_address->country) }}
---
From d70d2d065d8baafe9051978183f9cd9b7cb49520 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Mon, 19 Apr 2021 03:40:15 +0200 Subject: [PATCH 3/9] Added city to order summary --- .../shop/checkout/onepage/review.blade.php | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php index c4a089206..99109858c 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php @@ -24,10 +24,19 @@ {{ $billingAddress->name }}
  • - {{ $billingAddress->address1 }},
    {{ $billingAddress->state }} + {{ $billingAddress->address1 }},

    • +
  • - {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }} + {{ $billingAddress->postcode ." " . $billingAddress->city }} +

    • + +
  • + {{ $billingAddress->state }} +

    • + +
  • + {{ core()->country_name($billingAddress->country) }}

  • @@ -55,9 +64,18 @@
  • {{ $shippingAddress->address1 }},
    {{ $shippingAddress->state }}

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

    • + {{ $shippingAddress->postcode ." " . $shippingAddress->city }} +
    + +
  • + {{ $shippingAddress->state }} +

    • + +
  • + {{ core()->country_name($shippingAddress->country) }} +

  • {{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }} @@ -173,4 +191,4 @@
    • - \ No newline at end of file + From 335ca4846e5621a72a0788375bfc9bba5a9579a6 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Mon, 19 Apr 2021 03:52:18 +0200 Subject: [PATCH 4/9] Removed duplicate state --- .../src/Resources/views/shop/checkout/onepage/review.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php index 99109858c..2c4bcb570 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php @@ -62,7 +62,7 @@ {{ $shippingAddress->name }}
  • - {{ $shippingAddress->address1 }},
    {{ $shippingAddress->state }} + {{ $shippingAddress->address1 }},

  • From d359d95c36594c6acc8a5221c9222022f96b9312 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Mon, 19 Apr 2021 13:43:36 +0530 Subject: [PATCH 5/9] Icon Path Added --- .../API/Http/Resources/Catalog/Category.php | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/packages/Webkul/API/Http/Resources/Catalog/Category.php b/packages/Webkul/API/Http/Resources/Catalog/Category.php index ba5264b4a..180f13679 100644 --- a/packages/Webkul/API/Http/Resources/Catalog/Category.php +++ b/packages/Webkul/API/Http/Resources/Catalog/Category.php @@ -2,6 +2,7 @@ namespace Webkul\API\Http\Resources\Catalog; +use Illuminate\Support\Facades\Storage; use Illuminate\Http\Resources\Json\JsonResource; class Category extends JsonResource @@ -15,22 +16,25 @@ class Category extends JsonResource public function toArray($request) { return [ - 'id' => $this->id, - 'code' => $this->code, - 'name' => $this->name, - 'slug' => $this->slug, - 'display_mode' => $this->display_mode, - 'description' => $this->description, - 'meta_title' => $this->meta_title, - 'meta_description' => $this->meta_description, - 'meta_keywords' => $this->meta_keywords, - 'status' => $this->status, - 'image_url' => $this->image_url, - 'additional' => is_array($this->resource->additional) - ? $this->resource->additional - : json_decode($this->resource->additional, true), - 'created_at' => $this->created_at, - 'updated_at' => $this->updated_at, + 'id' => $this->id, + 'code' => $this->code, + 'name' => $this->name, + 'slug' => $this->slug, + 'display_mode' => $this->display_mode, + 'description' => $this->description, + 'meta_title' => $this->meta_title, + 'meta_description' => $this->meta_description, + 'meta_keywords' => $this->meta_keywords, + 'status' => $this->status, + 'image_url' => $this->image_url, + 'category_icon_path' => $this->category_icon_path + ? Storage::url($this->category_icon_path) + : null, + 'additional' => is_array($this->resource->additional) + ? $this->resource->additional + : json_decode($this->resource->additional, true), + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, ]; } -} \ No newline at end of file +} From f2f1e547b798b3198a44402105016384c63b0245 Mon Sep 17 00:00:00 2001 From: ghermans Date: Mon, 19 Apr 2021 15:04:01 +0200 Subject: [PATCH 6/9] updated templates --- .../views/checkout/onepage/review.blade.php | 24 ++++++++++++++-- .../emails/sales/new-admin-order.blade.php | 4 +-- .../new-inventorysource-shipment.blade.php | 28 +++++++++++++++---- .../views/emails/sales/new-invoice.blade.php | 28 +++++++++++++++---- .../views/emails/sales/new-order.blade.php | 2 +- .../views/emails/sales/new-refund.blade.php | 24 +++++++++++++--- .../views/emails/sales/new-shipment.blade.php | 24 +++++++++++++--- .../emails/sales/order-cancel-admin.blade.php | 24 +++++++++++++--- .../views/emails/sales/order-cancel.blade.php | 22 +++++++++++---- .../shop/checkout/onepage/review.blade.php | 4 +-- 10 files changed, 147 insertions(+), 37 deletions(-) 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 43950ef85..7ecea67d3 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,8 +19,17 @@ {{ $billingAddress->first_name }} {{ $billingAddress->last_name }}
  • - {{ $billingAddress->address1 }},
    {{ $billingAddress->state }} + {{ $billingAddress->address1 }},
    • + +
  • + {{ $billingAddress->postcode . " " . $billingAddress->city }} +
    • + +
  • + {{ $billingAddress->state }} +
    • +
  • {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
    • @@ -50,10 +59,19 @@ {{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}
  • - {{ $shippingAddress->address1 }},
    {{ $shippingAddress->state }} + {{ $shippingAddress->address1 }},
    • +
  • - {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }} + {{ $shippingAddress->postcode . " " . $shippingAddress->city }} +
    • + +
  • + {{ $shippingAddress->state }} +
    • + +
  • + {{ core()->country_name($shippingAddress->country) }}
    • 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 160bd6e5b..70acf516b 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 @@ -52,7 +52,7 @@
    - {{ $order->shipping_address->postcode ." " . $order->shipping_address->city }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
    @@ -97,7 +97,7 @@
    - {{ $order->billing_address->postcode ." " . $order->billing_address->city }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }}
    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 487d297ca..aa6849768 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 @@ -48,11 +48,19 @@
    - {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
    - +
    - {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }} +
    + +
    + {{ $order->shipping_address->state }} +
    + +
    + {{ core()->country_name($order->shipping_address->country) }}
    ---
    @@ -94,11 +102,19 @@
    - {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
    - +
    - {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }} +
    + +
    + {{ $order->billing_address->state }} +
    + +
    + {{ core()->country_name($order->billing_address->country) }}
    ---
    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 6a1b71ce5..8146c23af 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 @@ -47,11 +47,19 @@
    - {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
    - +
    - {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }} +
    + +
    + {{ $order->shipping_address->state }} +
    + +
    + {{ core()->country_name($order->shipping_address->country) }}
    ---
    @@ -84,11 +92,19 @@
    - {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
    - +
    - {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }} +
    + +
    + {{ $order->billing_address->state }} +
    + +
    + {{ core()->country_name($order->billing_address->country) }}
    ---
    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 d93827f5d..e6021ee94 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 @@ -48,7 +48,7 @@
    - {{ $order->shipping_address->postcode ." " . $order->shipping_address->city }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }}
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php index 993108341..cc71d2b6c 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php @@ -46,11 +46,19 @@
    - {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
    - {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }} +
    + +
    + {{ $order->shipping_address->state }} +
    + +
    + {{ core()->country_name($order->shipping_address->country) }}
    ---
    @@ -83,11 +91,19 @@
    - {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
    - {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }} +
    + +
    + {{ $order->billing_address->state }} +
    + +
    + {{ core()->country_name($order->billing_address->country) }}
    ---
    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 10d93391d..7acab7816 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,11 +45,19 @@
    - {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
    - {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }} +
    + +
    + {{ $order->shipping_address->state }} +
    + +
    + {{ core()->country_name($order->shipping_address->country) }}
    ---
    @@ -91,11 +99,19 @@
    - {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
    - {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }} +
    + +
    + {{ $order->billing_address->state }} +
    + +
    + {{ core()->country_name($order->billing_address->country) }}
    ---
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php index b768036de..5c08eca68 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel-admin.blade.php @@ -47,11 +47,19 @@
    - {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
    - {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }} +
    + +
    + {{ $order->shipping_address->state }} +
    + +
    + {{ core()->country_name($order->shipping_address->country) }}
    ---
    @@ -83,11 +91,19 @@
    - {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->address1 }}
    - {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }} +
    + +
    + {{ $order->billing_address->state }} +
    + +
    + {{ core()->country_name($order->billing_address->country) }}
    ---
    diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php index 494c2747c..b7a5b6bbf 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php @@ -43,11 +43,19 @@
    - {{ $order->shipping_address->address1 }}, {{ $order->shipping_address->state }} + {{ $order->shipping_address->address1 }}
    - {{ core()->country_name($order->shipping_address->country) }} {{ $order->shipping_address->postcode }} + {{ $order->shipping_address->postcode . " " . $order->shipping_address->city }} +
    + +
    + {{ $order->shipping_address->state }} +
    + +
    + {{ core()->country_name($order->shipping_address->country) }}
    ---
    @@ -75,15 +83,19 @@
    - {{ $order->billing_address->name }} + {{ $order->billing_address->address1 }}
    - {{ $order->billing_address->address1 }}, {{ $order->billing_address->state }} + {{ $order->billing_address->postcode . " " . $order->billing_address->city }} +
    + +
    + {{ $order->billing_address->state }}
    - {{ core()->country_name($order->billing_address->country) }} {{ $order->billing_address->postcode }} + {{ core()->country_name($order->billing_address->country) }}
    ---
    diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php index 2c4bcb570..d372f37b8 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php @@ -28,7 +28,7 @@
  • - {{ $billingAddress->postcode ." " . $billingAddress->city }} + {{ $billingAddress->postcode . " " . $billingAddress->city }}

  • @@ -66,7 +66,7 @@

  • - {{ $shippingAddress->postcode ." " . $shippingAddress->city }} + {{ $shippingAddress->postcode . " " . $shippingAddress->city }}

  • From 3072e2dbde277b8aaba5b8bcf6e10a443fbe2798 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Tue, 20 Apr 2021 05:23:15 +0200 Subject: [PATCH 7/9] Updated dutch translations --- .../Webkul/Shop/src/Resources/lang/nl/app.php | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index 4ec5d70b1..9d720a252 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -89,7 +89,7 @@ return [ 'star' => 'Ster', 'percentage' => ':percentage %', 'id-star' => 'star', - 'name' => 'Name', + 'name' => 'Naam', ], 'customer' => [ @@ -102,8 +102,8 @@ return [ 'removed' => 'Item successfully removed from compare list', 'removed-all' => 'All items successfully removed from compare list', 'empty-text' => "You don't have any items in your compare list", - 'product_image' => 'Product Image', - 'actions' => 'Actions', + 'product_image' => 'Product afbeelding', + 'actions' => 'Acties', ], 'signup-text' => [ @@ -126,22 +126,22 @@ return [ 'using' => 'by using this website', 'agreement' => 'Agreement', 'success' => 'Account succesvol aangemaakt.', - 'success-verify' => 'Account created successfully, an e-mail has been sent for verification.', - 'success-verify-email-unsent' => 'Account created successfully, but verification e-mail unsent.', - 'failed' => 'Error! Can not create your account, pleae try again later.', - 'already-verified' => 'Your account is already verified Or please try sending a new verification email again.', - 'verification-not-sent' => 'Error! Problem in sending verification email, please try again later.', - 'verification-sent' => 'Verification email sent', + 'success-verify' => 'Account succesvol aangemaakt, er is een e-mail verzonden ter verificatie.', + 'success-verify-email-unsent' => 'Account aangemaakt, maar de verificatie-e-mail is niet verzonden.', + 'failed' => 'Fout! Kan uw account niet aanmaken, probeer het later opnieuw.', + 'already-verified' => 'Je account is al geverifieerd.', + 'verification-not-sent' => 'Fout! Probleem bij het verzenden van een verificatie-e-mail. Probeer het later opnieuw.', + 'verification-sent' => 'Verificatie email verzonden', 'verified' => 'Uw account is geverifieerd, probeer nu in te loggen.', - 'verify-failed' => 'We cannot verify your mail account.', + 'verify-failed' => 'We kunnen uw e-mailaccount niet verifiëren.', 'dont-have-account' => 'U heeft geen account bij ons.', - 'success' => 'Account Created Successfully', - 'failed' => 'Error! Cannot Create Your Account, Try Again Later', - 'already-verified' => 'Your Account is already verified Or Please Try Sending A New Verification Email Again', - 'verification-not-sent' => 'Error! Problem In Sending Verification Email, Try Again Later', - 'verify-failed' => 'We Cannot Verify Your Mail Account', - 'dont-have-account' => 'You Do Not Have Account With Us', - 'customer-registration' => 'Customer Registered Successfully' + 'success' => 'Account succesvol aangemaakt', + 'failed' => 'Fout! Kan uw account niet maken. Probeer het later opnieuw', + 'already-verified' => 'Uw account is al geverifieerd of probeer nogmaals een nieuwe verificatie-e-mail te verzenden', + 'verification-not-sent' => 'Fout! Probleem bij het verzenden van verificatie-e-mail, probeer het later opnieuw', + 'verify-failed' => 'We kunnen uw e-mailaccount niet verifiëren', + 'dont-have-account' => 'U heeft geen account bij ons', + 'customer-registration' => 'Klant succesvol geregistreerd' ], 'login-text' => [ @@ -156,19 +156,19 @@ return [ 'password' => 'Wachtwoord', 'forgot_pass' => 'Wachtwoord vergeten?', 'button_title' => 'Aanmelden', - 'remember' => 'Remember Me', + 'remember' => 'Onthoud me', 'footer' => '© Copyright :year Webkul Software, All rights reserved', - 'invalid-creds' => 'Please check your credentials and try again.', - 'verify-first' => 'Verify your email account first.', - 'not-activated' => 'Your activation seeks admin approval', - 'resend-verification' => 'Resend verification mail again' + 'invalid-creds' => 'Controleer uw inloggegevens en probeer het opnieuw.', + 'verify-first' => 'Verifieer eerst uw e-mailaccount.', + 'not-activated' => 'Uw activering vraagt om goedkeuring van de beheerder.', + 'resend-verification' => 'Verzend de verificatie-e-mail opnieuw' ], 'forgot-password' => [ - 'title' => 'Recover Password', + 'title' => 'Wachtwoord herstellen', 'email' => 'Email', - 'submit' => 'Send Password Reset Email', - 'page_title' => 'Forgot your password ?' + 'submit' => 'Stuur wachtwoord reset e-mail', + 'page_title' => 'Uw wachtwoord vergeten ?' ], 'reset-password' => [ @@ -181,7 +181,7 @@ return [ ], 'account' => [ - 'dashboard' => 'Edit Profile', + 'dashboard' => 'Profiel wijzigen', 'menu' => 'Menu', 'general' => [ @@ -196,9 +196,9 @@ return [ 'edit' => 'Wijzig', ], - 'edit-success' => 'Profile updated successfully.', - 'edit-fail' => 'Error! Profile cannot be updated, please try again later.', - 'unmatch' => 'The old password does not match.', + 'edit-success' => 'Profiel succesvol bijgewerkt.', + 'edit-fail' => 'Fout! Profiel kan niet worden bijgewerkt. Probeer het later opnieuw.', + 'unmatch' => 'Het oude wachtwoord komt niet overeen.', 'fname' => 'Voornaam', 'lname' => 'Naam', @@ -227,18 +227,18 @@ return [ 'add' => 'Adres toevoegen', 'edit' => 'Wijzigen', 'empty' => 'U heeft hier geen opgeslagen adressen. Voeg minstens één adres toe door op de onderstaande link te klikken', - 'create' => 'Address toevoegen', + 'create' => 'Nieuw adres toevoegen', 'delete' => 'Verwijderen', 'make-default' => 'Maak standaard', 'default' => 'Standaard', 'contact' => 'Contact', 'confirm-delete' => 'Wilt u dit adres echt verwijderen?', - 'default-delete' => 'Standaardadres kan niet worden gewijzigd.', + 'default-delete' => 'Het standaard adres kan niet worden gewijzigd.', 'enter-password' => 'Voer uw wachtwoord in.', ], 'create' => [ - 'page-title' => 'Add Address Form', + 'page-title' => 'Nieuw adres toevoegen', 'company_name' => 'Bedrijfsnaam', 'first_name' => 'Voornaam', 'last_name' => 'Naam', @@ -247,7 +247,7 @@ return [ 'title' => 'Adres toevoegen', 'street-address' => 'Adres', 'country' => 'Land', - 'state' => 'Staat / Provincie', + 'state' => 'Provincie', 'select-state' => 'Selecteer een regio, staat of provincie', 'city' => 'Gemeente', 'postcode' => 'Postcode', @@ -313,17 +313,17 @@ return [ 'total' => 'Total', 'subtotal' => 'Subtotaal', 'shipping-handling' => 'Verzending en afhandeling', - 'tax' => 'Belasting', + 'tax' => 'BTW', 'discount' => 'Korting', - 'tax-percent' => 'Belastingpercentage', - 'tax-amount' => 'Belastingbedrag', + 'tax-percent' => 'BTWpercentage', + 'tax-amount' => 'BTWbedrag', 'discount-amount' => 'Korting hoeveelheid', 'grand-total' => 'Eindtotaal', 'total-paid' => 'Totaal betaald', 'total-refunded' => 'Totaal terugbetaald ', 'total-due' => 'Totaal verschuldigd', 'shipping-address' => 'Verzendingsadres', - 'billing-address' => 'factuur adres', + 'billing-address' => 'Facturatie adres ', 'shipping-method' => 'Verzendmethode', 'payment-method' => 'Betalingswijze', 'individual-invoice' => 'Factuur #:invoice_id', @@ -514,7 +514,7 @@ return [ 'payment' => 'Betaling', 'complete' => 'Complete', 'review' => 'Beoordeling', - 'billing-address' => 'Factuur adres', + 'billing-address' => 'Facturatie adres ', 'sign-in' => 'Inloggen', 'company-name' => 'Bedrijfsnaam', 'first-name' => 'Voornaam', @@ -524,9 +524,9 @@ return [ 'city' => 'stad', 'state' => 'Staat', 'select-state' => 'Selecteer een regio, staat of provincie', - 'postcode' => 'Zip/Postcode', + 'postcode' => 'Postcode', 'phone' => 'Telefoon', - 'country' => 'buiten', + 'country' => 'Land', 'order-summary' => 'overzicht van de bestelling', 'shipping-address' => 'Verzendingsadres', 'use_for_shipping' => 'Verzenden naar dit adres', @@ -537,7 +537,7 @@ return [ 'summary' => 'overzicht van de bestelling', 'price' => 'Prijs', 'quantity' => 'Aantal', - 'billing-address' => 'factuur adres', + 'billing-address' => 'Facturatie adres ', 'shipping-address' => 'Verzendingsadres', 'contact' => 'Contact', 'place-order' => 'Plaats bestelling', @@ -582,7 +582,7 @@ return [ 'success' => [ 'title' => 'Bestelling succesvol geplaatst', 'thanks' => 'Bedankt voor je bestelling!', - 'order-id-info' => 'Uw bestellings-ID is #:order_id', + 'order-id-info' => 'Uw ordernummer is #:order_id', 'info' => 'We sturen u een e-mail met uw bestelgegevens en trackinginformatie' ] ], @@ -591,13 +591,13 @@ return [ 'order' => [ 'subject' => 'Nieuwe orderbevestiging', 'heading' => 'Order bevestiging!', - 'dear' => 'Lieve :customer_name', - 'dear-admin' => 'Lieve :admin_name', + 'dear' => 'Beste :customer_name', + 'dear-admin' => 'Beste :admin_name', 'greeting' => 'Bedankt voor je bestelling :order_id geplaatst op :created_at', 'greeting-admin' => 'Order Id :order_id geplaatst op :created_at', 'summary' => 'Samenvatting van de bestelling', 'shipping-address' => 'Verzendingsadres', - 'billing-address' => 'factuur adres', + 'billing-address' => 'Facturatie adres ', 'contact' => 'Contact', 'shipping' => 'Verzendmethode', 'payment' => 'Betalingswijze', @@ -605,7 +605,7 @@ return [ 'quantity' => 'Aantal', 'subtotal' => 'Subtotal', 'shipping-handling' => 'Verzending en afhandeling', - 'tax' => 'Belasting', + 'tax' => 'BTW', 'discount' => 'Korting', 'grand-total' => 'Eindtotaal', 'final-summary' => 'Bedankt voor het tonen van uw interesse in onze winkel.We sturen u een trackingnummer zodra het is verzonden', @@ -614,7 +614,7 @@ return [ 'comment' => [ 'subject' => 'Nieuwe opmerking toegevoegd aan uw bestelling #:order_id', - 'dear' => 'Lieve :customer_name', + 'dear' => 'Beste :customer_name', 'final-summary' => 'Bedankt voor het tonen van uw interesse in onze winkel', 'help' => 'Als u hulp nodig heeft, neem dan contact met ons op via :support_email', 'thanks' => 'Bedankt!', @@ -623,17 +623,17 @@ return [ 'cancel' => [ 'subject' => 'Order Annuleren Bevestiging', 'heading' => 'Bestelling geannuleerd', - 'dear' => 'Lieve :customer_name', - 'greeting' => 'U bestelt met order-ID #:order_id geplaatst op :created_at is geannuleerd', + 'dear' => 'Beste :customer_name', + 'greeting' => 'Uw bestelling met ordernummer #:order_id geplaatst op :created_at is geannuleerd', 'summary' => 'Samenvatting van de bestelling', 'shipping-address' => 'Verzendingsadres', - 'billing-address' => 'factuur adres', + 'billing-address' => 'Facturatie adres ', 'contact' => 'Contact', 'shipping' => 'Verzendmethode', 'payment' => 'Betalingswijze', 'subtotal' => 'Subtotaal', 'shipping-handling' => 'Verzending en afhandeling', - 'tax' => 'Belasting', + 'tax' => 'BTW', 'discount' => 'Korting', 'grand-total' => 'Eindtotaal', 'final-summary' => 'Bedankt voor het tonen van uw interesse in onze winkel', @@ -649,7 +649,7 @@ return [ ], 'shipment' => [ - 'heading' => 'Verzending #:shipment_id is gegenereerd voor Order #:order_id', + 'heading' => 'Verzending #:shipment_id is gegenereerd voor order #:order_id', 'inventory-heading' => 'Nieuwe zending #:shipment_id was gegenereerd voor Order #:order_id', 'subject' => 'Verzending voor uw bestelling #:order_id', 'inventory-subject' => 'Er is een nieuwe zending gegenereerd voor de bestelling #:order_id', @@ -669,7 +669,7 @@ return [ 'forget-password' => [ 'subject' => 'Klant reset wachtwoord', - 'dear' => 'Lieve :name', + 'dear' => 'Beste :name', 'info' => 'U ontvangt deze e-mail omdat we een verzoek voor het opnieuw instellen van uw wachtwoord voor uw account hebben ontvangen', 'reset-password' => 'Wachtwoord opnieuw instellen', 'final-summary' => 'Als u geen wachtwoordherstel hebt aangevraagd, is er geen verdere actie vereist', @@ -678,14 +678,14 @@ return [ 'update-password' => [ 'subject' => 'Wachtwoord bijgewerkt', - 'dear' => 'Lieve :name', + 'dear' => 'Beste :name', 'info' => 'Je ontvangt deze e-mail omdat je je wachtwoord hebt bijgewerkt.', 'thanks' => 'Bedankt!' ], 'customer' => [ 'new' => [ - 'dear' => 'Lieve :customer_name', + 'dear' => 'Beste :customer_name', 'username-email' => 'UserName/Email', 'subject' => 'Nieuwe klantenregistratie', 'password' => 'Wachtwoord', @@ -697,7 +697,7 @@ return [ 'registration' => [ 'subject' => 'Nieuwe klantenregistratie', 'customer-registration' => 'Klant succesvol geregistreerd', - 'dear' => 'Lieve :customer_name', + 'dear' => 'Beste :customer_name', 'greeting' => 'Welkom en bedankt voor uw registratie bij ons!', 'summary' => 'Uw account is nu succesvol aangemaakt en u kunt inloggen met uw e-mailadres en wachtwoordgegevens. Na het inloggen hebt u toegang tot andere services, waaronder het bekijken van eerdere bestellingen, verlanglijstjes en het bewerken van uw accountgegevens.', 'thanks' => 'Thanks!', From b420ee782ff128a2eddf9f125de0e3abca2493ca Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 21 Apr 2021 11:54:53 +0530 Subject: [PATCH 8/9] Case Added --- .../Webkul/Shop/src/Http/Controllers/ProductController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductController.php index 6de37e243..a9a91969f 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ProductController.php @@ -79,7 +79,9 @@ class ProductController extends Controller 'attribute_id' => $attributeId, ]); - return Storage::download($productAttribute['text_value']); + return isset($productAttribute['text_value']) + ? Storage::download($productAttribute['text_value']) + : null; } /** From cd87356355ee66edc038ea222187b977ae044ec8 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 22 Apr 2021 16:52:19 +0530 Subject: [PATCH 9/9] Issue #4813 fixed --- packages/Webkul/Attribute/src/Models/AttributeFamily.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Attribute/src/Models/AttributeFamily.php b/packages/Webkul/Attribute/src/Models/AttributeFamily.php index 92279a82f..c651610e1 100755 --- a/packages/Webkul/Attribute/src/Models/AttributeFamily.php +++ b/packages/Webkul/Attribute/src/Models/AttributeFamily.php @@ -31,7 +31,7 @@ class AttributeFamily extends Model implements AttributeFamilyContract public function getComparableAttributesBelongsToFamily() { return (AttributeProxy::modelClass())::join('attribute_group_mappings', 'attribute_group_mappings.attribute_id', '=', 'attributes.id') - ->select('attributes.*')->where('attributes.is_comparable', 1)->get(); + ->select('attributes.*')->where('attributes.is_comparable', 1)->distinct()->get(); } /**