From 8506fc48b1b488ab3c753c552fb5ed881551fb2a Mon Sep 17 00:00:00 2001
From: Jimmy Hoenderdaal <jimmy@justbetter.nl>
Date: Thu, 14 Nov 2024 07:24:03 +0100
Subject: [PATCH 1/5] Enhance out of stock message

---
 lang/nl.json                                        |  3 ++-
 resources/views/cart/overview.blade.php             |  6 +++---
 .../cart/partials/product/description.blade.php     |  8 ++++----
 .../views/cart/partials/product/image.blade.php     |  9 +++++++--
 .../views/cart/partials/product/price.blade.php     |  4 +++-
 .../cart/partials/product/remove-button.blade.php   | 13 +++++++++----
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/lang/nl.json b/lang/nl.json
index 68f89e52..595096ce 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -10,7 +10,7 @@
     "Address created successfully": "Adres succesvol aangemaakt",
     "Address data": "Adresgegevens",
     "Already logged in": "Al ingelogd",
-    "Amount": "Bedrag",
+    "Amount": "Aantal",
     "An email is send with a password reset link if an account exists with the provided email address.": "Een e-mail is verzonden met een link om het wachtwoord te resetten, als er een account bestaat met het opgegeven e-mailadres.",
     "and use a different e-mail address.": "en gebruik een ander e-mailadres.",
     "Back to account": "Terug naar account",
@@ -72,6 +72,7 @@
     "Select an address": "Selecteer een adres",
     "Select as billing": "Selecteer als factuuradres",
     "Select as shipping": "Selecteer als verzendadres",
+    "This product is out of stock":"Dit product is op dit moment niet op voorraad",
     "Send": "Versturen",
     "Step :step out of :total": "Stap :step van :total",
     "Subscribe to newsletter": "Inschrijven voor nieuwsbrief",
diff --git a/resources/views/cart/overview.blade.php b/resources/views/cart/overview.blade.php
index d6c67097..a6f70c12 100644
--- a/resources/views/cart/overview.blade.php
+++ b/resources/views/cart/overview.blade.php
@@ -6,9 +6,9 @@
 
 @section('content')
     <graphql v-if="mask"
-        :query="'query getCart($cart_id: String!) { cart (cart_id: $cart_id) { ' + config.queries.cart + ' } }'"
-        :variables="{ cart_id: mask }" 
-        :callback="updateCart" 
+        :query="'query getCart($cart_id: String!) { cart (cart_id: $cart_id) { ...cart } } ' + config.fragments.cart"
+        :variables="{ cart_id: mask }"
+        :callback="updateCart"
         :error-callback="checkResponseForExpiredCart"
     >
     </graphql>
diff --git a/resources/views/cart/partials/product/description.blade.php b/resources/views/cart/partials/product/description.blade.php
index dba821f0..8ff8d863 100644
--- a/resources/views/cart/partials/product/description.blade.php
+++ b/resources/views/cart/partials/product/description.blade.php
@@ -1,15 +1,15 @@
 <td class="flex max-md:w-1/2 md:table-cell">
     @include('rapidez-ct::cart.partials.product.alert')
     <div class="flex flex-col items-start">
-        <a :href="item.product.url_key + item.product.url_suffix | url">
-            <div dusk="cart-item-name">@{{ item.product.name }}</div>
+        <div>
+            <a :href="item.product.url_key + item.product.url_suffix | url" dusk="cart-item-name">@{{ item.product.name }}</a>
             <div v-for="option in item.configurable_options">
                 @{{ option.option_label }}: @{{ option.value_label }}
             </div>
             <div v-for="option in item.customizable_options">
                 @{{ option.label }}: @{{ option.values[0].label || option.values[0].value }}
             </div>
-            <div class="text-red-600" v-if="!canOrderCartItem(item)">
+            <div v-if="!canOrderCartItem(item)" class="text-ct-error text-balance bg-ct-error/5 my-2 max-w-sm p-2">
                 @lang('This product is out of stock, remove it to continue your order.')
             </div>
             <div v-for="option in config.cart_attributes">
@@ -17,7 +17,7 @@
                     @{{ option }}: <span v-html="item.product.attribute_values[option]?.join(', ')"></span>
                 </template>
             </div>
-        </a>
+        </div>
         @include('rapidez-ct::cart.partials.product.remove-button')
     </div>
 </td>
diff --git a/resources/views/cart/partials/product/image.blade.php b/resources/views/cart/partials/product/image.blade.php
index dc720ec2..88a93c10 100644
--- a/resources/views/cart/partials/product/image.blade.php
+++ b/resources/views/cart/partials/product/image.blade.php
@@ -1,5 +1,10 @@
 <td class="h-24 w-32 !pl-0 max-md:flex max-md:w-1/2">
-    <img v-if="item.product.image" class="object-contain" :alt="item.product.name" :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento' + item.product.image.url.replace(config.media_url, '') + '.webp'">
+    <img
+        v-if="item.product.image"
+        v-bind:class="{'opacity-20' : !canOrderCartItem(item)}"
+        class="object-contain"
+        :alt="item.product.name"
+        :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento' + item.product.image.url.replace(config.media_url, '') + '.webp'"
+    >
     <x-rapidez::no-image v-else />
 </td>
-
diff --git a/resources/views/cart/partials/product/price.blade.php b/resources/views/cart/partials/product/price.blade.php
index 1245bc5e..7336be1d 100644
--- a/resources/views/cart/partials/product/price.blade.php
+++ b/resources/views/cart/partials/product/price.blade.php
@@ -7,7 +7,9 @@
     </div>
 </td>
 <td class="flex items-center font-medium max-md:w-1/3 md:table-cell *:mx-auto">
-    <x-rapidez-ct::input.quantity/>
+    <template v-if="canOrderCartItem(item)">
+        <x-rapidez-ct::input.quantity/>
+    </template>
 </td>
 <td class="flex items-center justify-end text-right font-medium max-md:w-1/3 md:table-cell">
     @{{ item.prices.row_total_including_tax.value | price }}
diff --git a/resources/views/cart/partials/product/remove-button.blade.php b/resources/views/cart/partials/product/remove-button.blade.php
index f528ecef..62d7632c 100644
--- a/resources/views/cart/partials/product/remove-button.blade.php
+++ b/resources/views/cart/partials/product/remove-button.blade.php
@@ -1,12 +1,17 @@
 <graphql-mutation
+    v-slot="{ mutate }"
     :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id }) { cart { ' + config.queries.cart + ' } } }'"
     :variables="{ cart_id: mask, cart_item_id: item.id }"
-    :notify="{ message: item.product.name+' '+config.translations.cart.remove }"
+    :notify="{ message: item.product.name + ' ' + config.translations.cart.remove }"
     :callback="updateCart"
     :error-callback="checkResponseForExpiredCart"
-    v-slot="{ mutate }"
 >
-    <button v-on:click="mutate" class="text-ct-inactive mt-1 text-xs hover:underline" :dusk="'item-delete-' + index">
+    <button
+        v-on:click="mutate"
+        class="text-ct-inactive mt-1 text-xs hover:underline"
+        v-bind:class="{'!text-ct-error !underline' : !canOrderCartItem(item)}"
+        :dusk="'item-delete-' + index"
+    >
         @lang('Remove')
     </button>
-</graphql-mutation>
\ No newline at end of file
+</graphql-mutation>

From 9a40bb5e9d0ad466346e697ae1fefd80e9f58705 Mon Sep 17 00:00:00 2001
From: Jimmy Hoenderdaal <jimmy@justbetter.nl>
Date: Fri, 15 Nov 2024 08:15:42 +0100
Subject: [PATCH 2/5] Replace v-if check variable

---
 resources/views/cart/partials/product/description.blade.php | 2 +-
 resources/views/cart/partials/product/image.blade.php       | 2 +-
 resources/views/cart/partials/product/price.blade.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/cart/partials/product/description.blade.php b/resources/views/cart/partials/product/description.blade.php
index 8ff8d863..ed52d43e 100644
--- a/resources/views/cart/partials/product/description.blade.php
+++ b/resources/views/cart/partials/product/description.blade.php
@@ -9,7 +9,7 @@
             <div v-for="option in item.customizable_options">
                 @{{ option.label }}: @{{ option.values[0].label || option.values[0].value }}
             </div>
-            <div v-if="!canOrderCartItem(item)" class="text-ct-error text-balance bg-ct-error/5 my-2 max-w-sm p-2">
+            <div v-if="!item.is_available" class="text-ct-error text-balance bg-ct-error/5 my-2 max-w-sm p-2">
                 @lang('This product is out of stock, remove it to continue your order.')
             </div>
             <div v-for="option in config.cart_attributes">
diff --git a/resources/views/cart/partials/product/image.blade.php b/resources/views/cart/partials/product/image.blade.php
index 88a93c10..96b9d1b5 100644
--- a/resources/views/cart/partials/product/image.blade.php
+++ b/resources/views/cart/partials/product/image.blade.php
@@ -1,7 +1,7 @@
 <td class="h-24 w-32 !pl-0 max-md:flex max-md:w-1/2">
     <img
         v-if="item.product.image"
-        v-bind:class="{'opacity-20' : !canOrderCartItem(item)}"
+        v-bind:class="{'opacity-20' : !item.is_available}"
         class="object-contain"
         :alt="item.product.name"
         :src="'/storage/{{ config('rapidez.store') }}/resizes/200/magento' + item.product.image.url.replace(config.media_url, '') + '.webp'"
diff --git a/resources/views/cart/partials/product/price.blade.php b/resources/views/cart/partials/product/price.blade.php
index 7336be1d..7f2a7e8a 100644
--- a/resources/views/cart/partials/product/price.blade.php
+++ b/resources/views/cart/partials/product/price.blade.php
@@ -7,7 +7,7 @@
     </div>
 </td>
 <td class="flex items-center font-medium max-md:w-1/3 md:table-cell *:mx-auto">
-    <template v-if="canOrderCartItem(item)">
+    <template v-if="item.is_available">
         <x-rapidez-ct::input.quantity/>
     </template>
 </td>

From 8531f36579ebb6e4e3a801357f870c80fd2c9da2 Mon Sep 17 00:00:00 2001
From: Jimmy Hoenderdaal <jimmy@justbetter.nl>
Date: Wed, 18 Dec 2024 10:42:04 +0100
Subject: [PATCH 3/5] Use correct variable

---
 resources/views/cart/partials/product/remove-button.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/cart/partials/product/remove-button.blade.php b/resources/views/cart/partials/product/remove-button.blade.php
index 62d7632c..10eaf407 100644
--- a/resources/views/cart/partials/product/remove-button.blade.php
+++ b/resources/views/cart/partials/product/remove-button.blade.php
@@ -9,7 +9,7 @@
     <button
         v-on:click="mutate"
         class="text-ct-inactive mt-1 text-xs hover:underline"
-        v-bind:class="{'!text-ct-error !underline' : !canOrderCartItem(item)}"
+        v-bind:class="{'!text-ct-error !underline' : !item.is_available}"
         :dusk="'item-delete-' + index"
     >
         @lang('Remove')

From 7d9ea0a558af8c30a28a8a1ab4d64e6a5fe03617 Mon Sep 17 00:00:00 2001
From: Jimmy Hoenderdaal <jimmy@justbetter.nl>
Date: Wed, 18 Dec 2024 10:46:19 +0100
Subject: [PATCH 4/5] Remove duplicate translations

---
 lang/nl.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lang/nl.json b/lang/nl.json
index 29431f08..fa618fa7 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -32,7 +32,6 @@
     "Enter your email address below, you will receive an email within minutes to reset the password.": "Voer hieronder uw e-mailadres in, u ontvangt binnen enkele minuten een e-mail om het wachtwoord te resetten.",
     "Everything centralized in 1 place such as returns, exchanges and customer service": "Alles gecentraliseerd op 1 plek zoals retouren, ruilingen en klantenservice",
     "Free": "Gratis",
-    "Go to your account": "Ga naar uw account",
     "Is this not your account?": "Is dit niet uw account?",
     "Log out": "Uitloggen",
     "Logout from your account": "Uitloggen van uw account",
@@ -76,7 +75,6 @@
     "Welcome back": "Welkom terug",
     "Yes, I want to subscribe to the newsletter": "Ja, ik wil me inschrijven voor de nieuwsbrief",
     "You already have an account with this e-mail address. Please log in to continue.": "U heeft al een account met dit e-mailadres. Log in om verder te gaan.",
-    "You do not have any orders yet.": "U heeft nog geen bestellingen.",
     "You will receive this newsletter approximately 2x a year": "U ontvangt deze nieuwsbrief ongeveer 2x per jaar",
     "Your order is currently": "Uw bestelling is momenteel",
     "and use a different e-mail address.": "en gebruik een ander e-mailadres."

From dbf5f741f6619ebc14c75b782f588b309ff6c1a5 Mon Sep 17 00:00:00 2001
From: Jimmy Hoenderdaal <jimmy@justbetter.nl>
Date: Wed, 18 Dec 2024 14:28:28 +0100
Subject: [PATCH 5/5] Fix translation

---
 lang/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/nl.json b/lang/nl.json
index fa618fa7..5fba9b97 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -62,7 +62,7 @@
     "Thank you for your order": "Bedankt voor uw bestelling",
     "This is a business account": "Dit is een zakelijke account",
     "This product is out of stock": "Dit product is op dit moment niet op voorraad",
-    "This product it out of stock, remove it to continue your order.": "Dit product is niet op voorraad, verwijder het om verder te gaan met je bestelling.",
+    "This product it out of stock, remove it to continue your order.": "Dit product is niet op voorraad, verwijder het om verder te gaan met uw bestelling.",
     "To checkout": "Naar afrekenen",
     "Total price": "Totale prijs",
     "Total price (incl. VAT)": "Totale prijs (incl. BTW)",