From 99497986abeaf41fc87d4ebab3116338f09a9fc8 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Thu, 29 May 2025 19:00:54 +0200
Subject: [PATCH 1/4] Update settings for browser target and checkout process

Changed `details_browser_target` to `_self` to open links in the same tab. Disabled multi-step checkout by setting `checkout_multistep_enabled` to `false`.
---
 client-app/config/settings_data.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-app/config/settings_data.json b/client-app/config/settings_data.json
index bcac2c07a7..3f8a61b8f8 100644
--- a/client-app/config/settings_data.json
+++ b/client-app/config/settings_data.json
@@ -1,7 +1,7 @@
 {
   "current": "default",
   "settings": {
-    "details_browser_target": "_blank",
+    "details_browser_target": "_self",
 
     "files_enabled": true,
 
@@ -24,7 +24,7 @@
 
     "zero_price_product_enabled": false,
 
-    "checkout_multistep_enabled": true,
+    "checkout_multistep_enabled": false,
     "checkout_comment_enabled": true,
     "checkout_purchase_order_enabled": true,
     "checkout_coupon_enabled": true,

From e061b95beb507d510ad3099f5b99667d40407bcc Mon Sep 17 00:00:00 2001
From: Maiia Diachkovskaia <mayapavlovna@gmail.com>
Date: Fri, 30 May 2025 16:42:32 +0900
Subject: [PATCH 2/4] feat: increase logo size

---
 .../shared/layout/components/header/_internal/bottom-header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-app/shared/layout/components/header/_internal/bottom-header.vue b/client-app/shared/layout/components/header/_internal/bottom-header.vue
index dfd1930a44..5f1335cba9 100644
--- a/client-app/shared/layout/components/header/_internal/bottom-header.vue
+++ b/client-app/shared/layout/components/header/_internal/bottom-header.vue
@@ -5,7 +5,7 @@
       class="relative z-[2] flex min-h-[5.5rem] items-center gap-x-5 bg-inherit px-5 py-3 xl:px-12"
     >
       <router-link :to="$context.settings.default_return_url ?? '/'">
-        <VcImage :src="logoUrl" :alt="$context.storeName" class="h-8 xl:h-[2.8rem]" lazy />
+        <VcImage :src="logoUrl" :alt="$context.storeName" class="h-8 xl:h-16" lazy />
       </router-link>
 
       <template v-if="organization">

From 760c0efc7fd352a82bddbb956cc6323a5bc9f5e5 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 30 May 2025 10:16:03 +0200
Subject: [PATCH 3/4] Update payment and order labels in localization files

- Changed "place_order" label to "Review Payment".
- Updated "DefaultManualPaymentMethod" to "Pay on Pickup".
- Changed "SkyflowPaymentMethod" to "Pay by Credit Card".
---
 locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index e5c5af8ee4..a6fcf84bb4 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -39,7 +39,7 @@
       "show_order": "Show order",
       "print": "Print",
       "print_order": "Print order",
-      "place_order": "Place order",
+      "place_order": "Review Payment",
       "back_to_cart": "Back to cart",
       "back_to_order_details": "Back to order details",
       "go_to_checkout": "Proceed to checkout",
@@ -285,8 +285,8 @@
     "methods": {
       "payment_by_code": {
         "AuthorizeNetPaymentMethod": "Bank card (Authorize.Net)",
-        "DefaultManualPaymentMethod": "Manual",
-        "SkyflowPaymentMethod": "Bank card (Skyflow)",
+        "DefaultManualPaymentMethod": "Pay on Pickup",
+        "SkyflowPaymentMethod": "Pay by Credit Card",
         "CyberSourcePaymentMethod": "Bank card (CyberSource)"
       },
       "delivery_by_id": {

From 585b4a795da676bf388308b13a6fd3736e0772bf Mon Sep 17 00:00:00 2001
From: virto-dev <andrej.artiomov@gmail.com>
Date: Fri, 6 Jun 2025 17:34:51 +0300
Subject: [PATCH 4/4] moa.json added

MOA theme color scheme added
---
 client-app/assets/presets/index.ts |   4 +-
 client-app/assets/presets/moa.json | 138 +++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 client-app/assets/presets/moa.json

diff --git a/client-app/assets/presets/index.ts b/client-app/assets/presets/index.ts
index 2f8fbfb23d..c9b526cf70 100644
--- a/client-app/assets/presets/index.ts
+++ b/client-app/assets/presets/index.ts
@@ -3,6 +3,7 @@ import defaultPreset from './default.json'
 import mercury from './mercury.json'
 import purplePink from './purple-pink.json'
 import watermelon from './watermelon.json'
+import moa from './moa.json'
 import type { IThemeConfigPreset } from "@/core/types";
 
 export const presets: Record<string, IThemeConfigPreset> = {
@@ -10,5 +11,6 @@ export const presets: Record<string, IThemeConfigPreset> = {
   default: defaultPreset,
   mercury: mercury,
   ['purple-pink']: purplePink,
-  watermelon: watermelon
+  watermelon: watermelon,
+  moa: moa
 } as const;
diff --git a/client-app/assets/presets/moa.json b/client-app/assets/presets/moa.json
new file mode 100644
index 0000000000..2f4a252e19
--- /dev/null
+++ b/client-app/assets/presets/moa.json
@@ -0,0 +1,138 @@
+{
+  "color_accent_50": "#fbe9f1",
+    "color_accent_100": "#f7d4e4",
+    "color_accent_200": "#f0a8c8",
+    "color_accent_300": "#e981b0",
+    "color_accent_400": "#e15695",
+    "color_accent_500": "#da2b79",
+    "color_accent_600": "#b21f61",
+    "color_accent_700": "#871749",
+    "color_accent_800": "#570f2f",
+    "color_accent_900": "#2b0818",
+    "color_accent_950": "#16040c",
+
+    "color_primary_50": "#edeeef",
+    "color_primary_100": "#d4d6d8",
+    "color_primary_200": "#a9adb1",
+    "color_primary_300": "#7f838b",
+    "color_primary_400": "#575b60",
+    "color_primary_500": "#313336",
+    "color_primary_600": "#27282b",
+    "color_primary_700": "#1d1e20",
+    "color_primary_800": "#131415",
+    "color_primary_900": "#0a0a0b",
+    "color_primary_950": "#050505",
+
+    "color_secondary_50": "#eff8ed",
+    "color_secondary_100": "#e0f1da",
+    "color_secondary_200": "#bee1b2",
+    "color_secondary_300": "#9fd38d",
+    "color_secondary_400": "#7fc568",
+    "color_secondary_500": "#5aaa3f",
+    "color_secondary_600": "#4e8f38",
+    "color_secondary_700": "#3a6b29",
+    "color_secondary_800": "#26461b",
+    "color_secondary_900": "#14250e",
+    "color_secondary_950": "#0a1207",
+
+    "color_neutral_50": "#fafafa",
+    "color_neutral_100": "#f5f5f5",
+    "color_neutral_200": "#e7e7e7",
+    "color_neutral_300": "#cccccc",
+    "color_neutral_400": "#a3a3a3",
+    "color_neutral_500": "#737373",
+    "color_neutral_600": "#525252",
+    "color_neutral_700": "#404040",
+    "color_neutral_800": "#262626",
+    "color_neutral_900": "#171717",
+    "color_neutral_950": "#0a0a0a",
+
+    "color_additional_50": "#ffffff",
+    "color_additional_950": "#000000",
+
+    "color_warning_50": "#fff6d6",
+    "color_warning_100": "#fff2c4",
+    "color_warning_200": "#ffe7a0",
+    "color_warning_300": "#ffda7c",
+    "color_warning_400": "#ffcb59",
+    "color_warning_500": "#ffba35",
+    "color_warning_600": "#fc9e00",
+    "color_warning_700": "#b46b0f",
+    "color_warning_800": "#8c4f00",
+    "color_warning_900": "#542d00",
+    "color_warning_950": "#381d00",
+
+    "color_danger_50": "#ffe9e8",
+    "color_danger_100": "#ffd9d9",
+    "color_danger_300": "#ff9191",
+    "color_danger_200": "#ffb5b5",
+    "color_danger_400": "#ff6e6e",
+    "color_danger_500": "#ff4a4a",
+    "color_danger_600": "#ff0808",
+    "color_danger_800": "#820000",
+    "color_danger_700": "#c40000",
+    "color_danger_900": "#400000",
+    "color_danger_950": "#1f0000",
+
+    "color_success_50": "#e4f4e2",
+    "color_success_100": "#c8e9cb",
+    "color_success_200": "#a9d4ba",
+    "color_success_300": "#8dc6a4",
+    "color_success_400": "#72b98f",
+    "color_success_500": "#57ab79",
+    "color_success_600": "#43875f",
+    "color_success_700": "#316144",
+    "color_success_800": "#1e3c2a",
+    "color_success_900": "#0b1610",
+    "color_success_950": "#020403",
+
+    "color_info_50": "#edf8fd",
+    "color_info_100": "#e3eff5",
+    "color_info_200": "#c4deeb",
+    "color_info_300": "#a6cde1",
+    "color_info_400": "#87bcd6",
+    "color_info_500": "#69abcc",
+    "color_info_600": "#4093bd",
+    "color_info_700": "#327393",
+    "color_info_800": "#245269",
+    "color_info_900": "#15313f",
+    "color_info_950": "#0e212a",
+
+    "color_body_bg": "#fafafa",
+    "color_body_text": "#0a0a0a",
+    "color_link": "#262626",
+    "color_link_hover": "#b21f61",
+    "color_price": "#0a0a0b",
+    "color_mobile_menu_bg": "#27282b",
+    "color_mobile_menu_text": "#ffffff",
+    "color_mobile_menu_link": "#bee1b2",
+    "color_mobile_menu_link_active": "#ffffff",
+    "color_mobile_menu_icon": "#7fc568",
+    "color_mobile_menu_icon_active": "#e15695",
+    "color_header_top_bg": "#131415",
+    "color_header_top_text": "#ffffff",
+    "color_header_top_link": "#d4d6d8",
+    "color_header_top_link_hover": "#ffffff",
+    "color_header_bottom_bg": "#ffffff",
+    "color_header_bottom_text": "#0a0a0b",
+    "color_header_bottom_link": "#313336",
+    "color_header_bottom_link_hover": "#4e8f38",
+    "color_header_bottom_link_active": "#4e8f38",
+    "color_header_top_link_active": "#ffffff",
+    "color_footer_top_bg": "#27282b",
+    "color_footer_top_text": "#ffffff",
+    "color_footer_top_link": "#f5f5f5",
+    "color_footer_top_link_hover": "#e7e7e7",
+    "color_footer_top_link_active": "#9fd38d",
+    "color_footer_bottom_bg": "#171717",
+    "color_footer_bottom_text": "#ffffff",
+    "color_footer_bottom_link": "#e7e7e7",
+    "color_footer_bottom_link_hover": "#f5f5f5",
+    "color_footer_bottom_link_active": "#f5f5f5",
+    "color_hexagon_icon_bg": "#da2b79",
+    "color_hexagon_icon": "#ffffff",
+    "color_mobile_search_bar_bg": "#26461b",
+    "color_mobile_menu_navigation": "#e15695",
+    "color_mobile_active_control": "#5aaa3f",
+    "color_empty_list_icon": "#313336"
+}