Fix conflicts

FosterCommerce · Dec 18, 2024 · 603f0c6 · 603f0c6
1 parent e2a1b50
commit 603f0c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/src/templates/_components/app/line-item-cart.twig b/src/templates/_components/app/line-item-cart.twig
@@ -197,16 +197,16 @@
 				class="flex flex-col justify-between items-start gap-2 sm:flex-row sm:justify-start sm:items-center sm:gap-8">
 
 				{% if craft.fostercheckout.settings.options.enableSaveForLater %}
-					<button
-						class="inline-flex justify-start items-center gap-2 text-sm underline text-gray-500 hover:no-underline hover:text-gray-700">
-						<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"
-								 class="fill-current">
-							<path
-								d="M6.99605 13.1188L6.24497 12.4424C5.05921 11.3566 4.08101 10.4194 3.31035 9.63079C2.53971 8.84215 1.92528 8.13683 1.46707 7.51484C1.00885 6.89286 0.68807 6.32855 0.504736 5.82191C0.321403 5.31526 0.229736 4.8024 0.229736 4.28333C0.229736 3.2541 0.575147 2.39341 1.26597 1.70126C1.95679 1.0091 2.81126 0.663025 3.82939 0.663025C4.46006 0.663025 5.04418 0.809042 5.58174 1.10108C6.1193 1.39311 6.59074 1.81714 6.99605 2.37318C7.46803 1.78381 7.9638 1.35144 8.48337 1.07608C9.00294 0.800709 9.56272 0.663025 10.1627 0.663025C11.1835 0.663025 12.0399 1.0091 12.7321 1.70126C13.4243 2.39341 13.7703 3.2541 13.7703 4.28333C13.7703 4.8024 13.6787 5.3146 13.4953 5.81993C13.312 6.32524 12.9912 6.88888 12.533 7.51086C12.0748 8.13284 11.4597 8.83881 10.6877 9.62879C9.91574 10.4188 8.93688 11.3566 7.75112 12.4424L6.99605 13.1188Z"
-								fill="#6B7280"/>
-						</svg>
-						<span class="inline">{{ 'Save for later'|t('foster-checkout') }}</span>
-					</button>
+				<button
+					class="inline-flex justify-start items-center gap-2 text-sm underline text-gray-500 hover:no-underline hover:text-gray-700">
+					<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"
+							 class="fill-current">
+						<path
+							d="M6.99605 13.1188L6.24497 12.4424C5.05921 11.3566 4.08101 10.4194 3.31035 9.63079C2.53971 8.84215 1.92528 8.13683 1.46707 7.51484C1.00885 6.89286 0.68807 6.32855 0.504736 5.82191C0.321403 5.31526 0.229736 4.8024 0.229736 4.28333C0.229736 3.2541 0.575147 2.39341 1.26597 1.70126C1.95679 1.0091 2.81126 0.663025 3.82939 0.663025C4.46006 0.663025 5.04418 0.809042 5.58174 1.10108C6.1193 1.39311 6.59074 1.81714 6.99605 2.37318C7.46803 1.78381 7.9638 1.35144 8.48337 1.07608C9.00294 0.800709 9.56272 0.663025 10.1627 0.663025C11.1835 0.663025 12.0399 1.0091 12.7321 1.70126C13.4243 2.39341 13.7703 3.2541 13.7703 4.28333C13.7703 4.8024 13.6787 5.3146 13.4953 5.81993C13.312 6.32524 12.9912 6.88888 12.533 7.51086C12.0748 8.13284 11.4597 8.83881 10.6877 9.62879C9.91574 10.4188 8.93688 11.3566 7.75112 12.4424L6.99605 13.1188Z"
+							fill="#6B7280"/>
+					</svg>
+					<span class="inline">{{ 'Save for later'|t('foster-checkout') }}</span>
+				</button>
 				{% endif %}
 
 				<button

diff --git a/src/templates/cart/index.twig b/src/templates/cart/index.twig
@@ -117,13 +117,8 @@
 
 	{% if cart.lineItems|length > 0 %}
 		<div class="p-4 bg-gray-200 sm:p-6">
-<<<<<<< HEAD
 			<a href="{{ siteUrl(craft.fostercheckout.settings.paths.checkout) }}"
 			   class="block w-full px-4 py-3 font-medium text-white text-center bg-[var(--brandColor)] border border-[var(--brandColor)] rounded-xl"
-=======
-			<a href="{{ craft.fostercheckout.getPath('checkout') }}"
-				 class="block w-full px-4 py-3 font-medium text-white text-center bg-[var(--brandColor)] border border-[var(--brandColor)] rounded-xl"
->>>>>>> main
 			>
 				{{ 'Checkout'|t('foster-checkout') }}
 			</a>

diff --git a/src/templates/checkout/order.twig b/src/templates/checkout/order.twig
@@ -122,8 +122,8 @@
 			</div>
 
 			{% if craft.fostercheckout.settings.options.enableMadeAMistake %}
-				{% set mistakeHeading = craft.checkout.note('mistakeHeading') %}
-				{% set mistakeText = craft.checkout.note('mistakeText') %}
+				{% set mistakeHeading = craft.fostercheckout.note('mistakeHeading') %}
+				{% set mistakeText = craft.fostercheckout.note('mistakeText') %}
 				<div class="hidden lg:block">
 					{% if mistakeHeading %}
 						<h3 class="font-semibold text-2xl">{{ mistakeHeading }}</h3>