easyorders 0.1.15 → 0.1.16

package/dist/template/theme/sections/header.liquid

@@ -1,12 +1,38 @@
-
-<div class="ab-theme" >
+<style>
+  :root {
+    --ab-main-container-top-padding: {{ theme_data.main_container_padding_top | default: 40 }}px;
+  }
+</style>
+<div
+  class="ab-theme"
+  style="
+    --ab-logo-height-desktop: {{ theme_data.logo_height_desktop | default: 47 }}px;
+    --ab-logo-height-mobile: {{ theme_data.logo_height_mobile | default: 20 }}px;
+    --ab-main-container-top-padding: {{ theme_data.main_container_padding_top | default: 40 }}px;
+    --ab-header-category-bg: {{ theme_data.header_category_strip_bg_color | default: '#e1dbd1' }};
+    --ab-header-category-text: {{ theme_data.header_category_strip_text_color | default: '#212a2f' }};
+  "
+>
 {% if announcement_config and announcement_config.text.size > 0 %}
-<div class="ab-announce" data-ann-type="{{ announcement_config.type }}">
+{% assign first_announce_text = announcement_config.text | first | default: "" %}
+{% assign announce_is_arabic = false %}
+{% if lang == "ar" or first_announce_text contains "ا" or first_announce_text contains "ب" or first_announce_text contains "ت" or first_announce_text contains "ث" or first_announce_text contains "ج" or first_announce_text contains "ح" or first_announce_text contains "خ" %}
+  {% assign announce_is_arabic = true %}
+{% endif %}
+{% assign ann_repeat_count = 4 %}
+{% if announcement_config.text.size <= 1 %}
+  {% assign ann_repeat_count = 8 %}
+{% elsif announcement_config.text.size == 2 %}
+  {% assign ann_repeat_count = 6 %}
+{% endif %}
+<div class="ab-announce{% if announce_is_arabic %} ab-announce--arabic{% endif %}" data-ann-type="{{ announcement_config.type }}">
   {% if announcement_config.type == "marquee" %}
     <div class="ab-ann-marquee">
       <div class="ab-ann-marquee-track">
-        {% for item in announcement_config.text %}
-          <span class="ab-ann-marquee-item">{{ item }}</span>
+        {% for repeat_index in (1..ann_repeat_count) %}
+          {% for item in announcement_config.text %}
+            <span class="ab-ann-marquee-item">{{ item }}</span>
+          {% endfor %}
         {% endfor %}
       </div>
     </div>
@@ -34,7 +60,13 @@
 <header id="eo-header" class="ab-header">
   <div class="ab-header-inner">
     <div style="display:flex;align-items:center;">
-      <button id="eo-menu-btn" class="ab-hamburger" aria-label="Menu"></button>
+      <button id="eo-menu-btn" class="ab-hamburger" aria-label="Menu">
+        <svg class="ab-hamburger-icon size-6" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+          <line stroke="currentColor" stroke-width="1.5" x1="6.65" y1="7.5" x2="18.35" y2="7.5"></line>
+          <line stroke="currentColor" stroke-width="1.5" x1="6.65" y1="12" x2="18.35" y2="12"></line>
+          <line stroke="currentColor" stroke-width="1.5" x1="6.65" y1="16.5" x2="13.85" y2="16.5"></line>
+        </svg>
+      </button>
       <a href="/" class="ab-logo">
         {% if logo %}
           <img src="{{ logo }}" alt="{{ store_name }}" />
@@ -62,14 +94,14 @@
     </nav>
 
     <div class="ab-right">
+     <button type="button" id="header-lang-btn" class="ab-icon-btn lang-btn" aria-label="Change Language" hidden onclick="this.dispatchEvent(new CustomEvent('lang-click',{bubbles:true}))"></button>
+
       <a href="/search" class="ab-icon-btn search-btn" aria-label="Search"></a>
 
       {% if is_register_active %}
       <button type="button" id="header-register" class="ab-icon-btn register-btn" aria-label="Register" onclick="this.dispatchEvent(new CustomEvent('register-click',{bubbles:true}))"></button>
       {% endif %}
 
-      <button type="button" id="header-lang-btn" class="ab-icon-btn lang-btn" aria-label="Change Language" hidden onclick="this.dispatchEvent(new CustomEvent('lang-click',{bubbles:true}))"></button>
-
       {% comment %} Desktop header: Wishlist link with live count badge & Compare button — dispatches compare-click event; count badges updated by JS
       <a href="/wishlist" class="ab-icon-btn wishlist-btn" aria-label="Wishlist">
         <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"/></svg>
@@ -87,20 +119,26 @@
       </button>
     </div>
   </div>
+
+  <div class="ab-header-category">
+    {% for category in categories %}
+      <a href="{{ category.url }}">{{ category.name }}</a>
+    {% endfor %}
+  </div>
 </header>
 
 <div id="eo-mobile-overlay" class="ab-mobile-overlay"></div>
-<div id="eo-mobile-menu" class="ab-mobile-menu">
-  <div class="ab-mobile-menu-header">
-    <button id="eo-mobile-close" class="ab-mobile-close" aria-label="Close menu"></button>
-    <a href="/" class="ab-logo">
-      {% if logo %}
-        <img src="{{ logo }}" alt="{{ store_name }}" />
-      {% else %}
-        <span class="ab-logo-text">{{ store_name }}</span>
-      {% endif %}
-    </a>
-  </div>
+  <div id="eo-mobile-menu" class="ab-mobile-menu">
+    <div class="ab-mobile-menu-header">
+      <button id="eo-mobile-close" class="ab-mobile-close" aria-label="Close menu"></button>
+      <a href="/" class="ab-logo">
+        {% if logo %}
+          <img src="{{ logo }}" alt="{{ store_name }}" />
+        {% else %}
+          <span class="ab-logo-text">{{ store_name }}</span>
+        {% endif %}
+      </a>
+    </div>
   <nav class="ab-mobile-nav">
     {% for category in categories %}
       {% if category.children.size > 0 %}
@@ -119,14 +157,13 @@
       {% else %}
         <a href="{{ category.url }}">
           <span>{{ category.name }}</span>
-          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><path d="M10 8l4 4-4 4"/></svg>
-        </a>
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
+             <circle cx="12" cy="12" r="9" />
+            <path d="M11 9l3 3-3 3" />
+          </svg>       </a>
       {% endif %}
     {% endfor %}
-    <a href="/search">
-      <span>Search</span>
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
-    </a>
+     
     {% if is_register_active %}
     <button type="button" id="header-register-mobile" class="register-btn" aria-label="Register" onclick="this.dispatchEvent(new CustomEvent('register-click',{bubbles:true}))">
       <span>Register</span>
@@ -147,6 +184,49 @@
     </button>
     {% endcomment %}
   </nav>
+  {% assign mobile_menu_social = social %}
+  {% assign mobile_menu_pages = pages %}
+  {% if mobile_menu_social == blank and footer and footer.social %}
+    {% assign mobile_menu_social = footer.social %}
+  {% endif %}
+  {% if mobile_menu_pages == blank and footer and footer.pages %}
+    {% assign mobile_menu_pages = footer.pages %}
+  {% endif %}
+
+  {% if mobile_menu_social.size > 0 or mobile_menu_pages.size > 0 %}
+    <div class="ab-mobile-menu-footer">
+      {% if mobile_menu_social.size > 0 %}
+        <div class="ab-mobile-menu-footer-social ab-footer-social-icons">
+          {% for item in mobile_menu_social %}
+            {% assign social_label = item.label | default: item.type | default: "social" %}
+            <a href="{{ item.url }}" target="_blank" rel="noreferrer" aria-label="{{ social_label }}">
+              {% if item.icon %}
+                <span class="ab-footer-social-img" style="-webkit-mask-image:url({{ item.icon }});mask-image:url({{ item.icon }})"></span>
+              {% else %}
+                <span class="ab-mobile-menu-footer-social-fallback">{{ social_label | slice: 0, 1 | upcase }}</span>
+              {% endif %}
+            </a>
+          {% endfor %}
+        </div>
+      {% endif %}
+
+      {% if mobile_menu_pages.size > 0 %}
+        <div class="ab-mobile-menu-footer-pages">
+          {% for page in mobile_menu_pages %}
+            {% if page.url %}
+              {% assign page_href = page.url %}
+            {% else %}
+              {% assign page_href = "/pages/" | append: page.slug %}
+            {% endif %}
+            <a href="{{ page_href }}">{{ page.title | default: page.name }}</a>
+            {% unless forloop.last %}
+              <span class="ab-mobile-menu-footer-sep" aria-hidden="true">&middot;</span>
+            {% endunless %}
+          {% endfor %}
+        </div>
+      {% endif %}
+    </div>
+  {% endif %}
 </div>
 
 </div>

package/dist/template/theme/sections/home-products-grid.liquid

@@ -1,10 +1,24 @@
 
-<section class="ab-pgrid">
+<section
+  class="ab-pgrid"
+  style="
+    --ab-sale-badge-bg: {{ theme_data.sale_badge_bg_color | default: '#c94a4a' }};
+    --ab-sale-badge-text: {{ theme_data.sale_badge_text_color | default: '#ffffff' }};
+    --ab-product-card-bg: {% if theme_data.card_background_product == 'transparent' %}transparent{% else %}{{ theme_data.card_background_product_color | default: '#f5f4f2' }}{% endif %};
+    --ab-pgrid-hero-cta-color: {{ theme_data.pgrid_hero_cta_text_color | default: '#1f272b' }};
+    --ab-pgrid-hero-cta-weight: {{ theme_data.pgrid_hero_cta_font_weight | default: '600' }};
+  "
+>
   <div class="ab-pgrid-wrap">
     {% for product in products limit: 7 %}
       {% assign color_variation = product.variations | where: "type", "color" | first %}
       {% assign image_variation = product.variations | where: "type", "image" | first %}
       {% assign swatch_total = 0 %}
+      {% assign pgrid_has_sale = false %}
+      {% if product.sale_price and product.sale_price < product.price and theme_data.show_sale_badge != false %}
+        {% assign pgrid_has_sale = true %}
+      {% endif %}
+      {% assign pgrid_custom_badge_value = pgrid_custom_badge | default: product.custom_badge_title | default: '' %}
       {% if color_variation and color_variation.props %}
         {% assign swatch_total = color_variation.props.size %}
       {% elsif image_variation and image_variation.props %}
@@ -35,10 +49,52 @@
         </a>
       {% endif %}
 
+      {% assign pgrid_custom_badge = '' %}
+      {% if product.product_theme_data %}
+        {% assign pgrid_custom_badge = product.product_theme_data.custom_badge_title | strip %}
+      {% endif %}
+      {% assign pgrid_has_sale = false %}
+      {% if product.sale_price and product.sale_price < product.price and theme_data.show_sale_badge != false %}
+        {% assign pgrid_has_sale = true %}
+      {% endif %}
+      {% assign pgrid_has_variants = false %}
+      {% if product.variations and product.variations.size > 0 %}
+        {% assign pgrid_has_variants = true %}
+      {% endif %}
+      {% assign pgrid_disable_no_stock_str = product.disable_orders_for_no_stock | append: '' | downcase | strip %}
+      {% assign pgrid_disable_no_stock = false %}
+      {% if pgrid_disable_no_stock_str == 'true' or pgrid_disable_no_stock_str == '1' %}
+        {% assign pgrid_disable_no_stock = true %}
+      {% endif %}
+      {% assign pgrid_stock_flag_raw = product.in_stock | default: product.available %}
+      {% assign pgrid_stock_flag_str = pgrid_stock_flag_raw | append: '' | downcase | strip %}
+      {% assign pgrid_is_out_of_stock = false %}
+      {% if pgrid_stock_flag_str == 'false' or pgrid_stock_flag_str == '0' %}
+        {% assign pgrid_is_out_of_stock = true %}
+      {% elsif pgrid_stock_flag_str == 'true' or pgrid_stock_flag_str == '1' %}
+        {% assign pgrid_is_out_of_stock = false %}
+      {% else %}
+        {% assign pgrid_stock_qty = product.quantity | default: product.stock | default: product.total_quantity | default: 0 | plus: 0 %}
+        {% if pgrid_stock_qty <= 0 %}
+          {% assign pgrid_is_out_of_stock = true %}
+        {% endif %}
+      {% endif %}
+      {% assign pgrid_hide_add_btn = false %}
+      {% if pgrid_disable_no_stock and pgrid_has_variants == false and pgrid_is_out_of_stock %}
+        {% assign pgrid_hide_add_btn = true %}
+      {% endif %}
+
       <a href="/products/{{ product.slug }}" class="ab-pgrid-card ab-reveal" style="animation-delay: {{ forloop.index | times: 0.04 }}s">
-        {% if product.sale_price and product.sale_price < product.price %}
-          {% assign discount = product.price | minus: product.sale_price | times: 100 | divided_by: product.price | floor %}
-          <span class="ab-pgrid-badge ab-sale-badge">{{ sale }} -{{ discount }}%</span>
+        {% if pgrid_has_sale or pgrid_custom_badge != '' %}
+          <div class="ab-pgrid-badge-stack">
+            {% if pgrid_has_sale %}
+              {% assign discount = product.price | minus: product.sale_price | times: 100 | divided_by: product.price | floor %}
+              <span class="ab-pgrid-badge ab-sale-badge">-{{ discount }}%</span>
+            {% endif %}
+            {% if pgrid_custom_badge != '' %}
+              <span class="ab-pgrid-badge ab-product-custom-badge">{{ pgrid_custom_badge }}</span>
+            {% endif %}
+          </div>
         {% endif %}
 
         <div class="ab-pgrid-media">
@@ -66,12 +122,14 @@
             </button>
           </div>
           {% endcomment %}
-          <button
-            class="ab-pgrid-add-btn"
-            type="button"
-            aria-label="Add to cart"
-            onclick="event.preventDefault();event.stopPropagation();this.dispatchEvent(new CustomEvent('quick-add',{bubbles:true,detail:{productId:'{{ product.id }}'}}));"
-          ></button>
+          {% unless pgrid_hide_add_btn %}
+            <button
+              class="ab-pgrid-add-btn"
+              type="button"
+              aria-label="Add to cart"
+              onclick="event.preventDefault();event.stopPropagation();this.dispatchEvent(new CustomEvent('quick-add',{bubbles:true,detail:{productId:'{{ product.id }}'}}));"
+            ></button>
+          {% endunless %}
         </div>
 
         <div class="ab-pgrid-info">

package/dist/template/theme/sections/list-products.liquid

@@ -1,4 +1,11 @@
-<section class="ab-plist">
+<section
+  class="ab-plist"
+  style="
+    --ab-sale-badge-bg: {{ theme_data.sale_badge_bg_color | default: '#c94a4a' }};
+    --ab-sale-badge-text: {{ theme_data.sale_badge_text_color | default: '#ffffff' }};
+    --ab-product-card-bg: {% if theme_data.card_background_product == 'transparent' %}transparent{% else %}{{ theme_data.card_background_product_color | default: '#f5f4f2' }}{% endif %};
+  "
+>
   <div class="ab-plist-header">
     {% if section_title %}
       <h2 class="ab-plist-title ab-reveal">{{ section_title }}</h2>
@@ -22,48 +29,72 @@
     {% for product in products %}
       {% assign color_variation = product.variations | where: "type", "color" | first %}
       {% assign image_variation = product.variations | where: "type", "image" | first %}
-
-      <a href="/products/{{ product.slug }}" class="ab-plist-card ab-reveal" style="animation-delay: {{ forloop.index | times: 0.04 }}s">
-        {% if product.sale_price and product.sale_price < product.price %}
-          {% assign discount = product.price | minus: product.sale_price | times: 100 | divided_by: product.price | floor %}
-          <span class="ab-plist-badge ab-sale-badge">{{ sale }} -{{ discount }}%</span>
+      {% assign plist_custom_badge = '' %}
+      {% if product.product_theme_data %}
+        {% assign plist_custom_badge = product.product_theme_data.custom_badge_title | strip %}
+      {% endif %}
+      {% assign plist_has_sale = false %}
+      {% if product.sale_price and product.sale_price < product.price and theme_data.show_sale_badge != false %}
+        {% assign plist_has_sale = true %}
+      {% endif %}
+      {% assign plist_has_variants = false %}
+      {% if product.variations and product.variations.size > 0 %}
+        {% assign plist_has_variants = true %}
+      {% endif %}
+      {% assign plist_disable_no_stock_str = product.disable_orders_for_no_stock | append: '' | downcase | strip %}
+      {% assign plist_disable_no_stock = false %}
+      {% if plist_disable_no_stock_str == 'true' or plist_disable_no_stock_str == '1' %}
+        {% assign plist_disable_no_stock = true %}
+      {% endif %}
+      {% assign plist_stock_flag_raw = product.in_stock | default: product.available %}
+      {% assign plist_stock_flag_str = plist_stock_flag_raw | append: '' | downcase | strip %}
+      {% assign plist_is_out_of_stock = false %}
+      {% if plist_stock_flag_str == 'false' or plist_stock_flag_str == '0' %}
+        {% assign plist_is_out_of_stock = true %}
+      {% elsif plist_stock_flag_str == 'true' or plist_stock_flag_str == '1' %}
+        {% assign plist_is_out_of_stock = false %}
+      {% else %}
+        {% assign plist_stock_qty = product.quantity | default: product.stock | default: product.total_quantity | default: 0 | plus: 0 %}
+        {% if plist_stock_qty <= 0 %}
+          {% assign plist_is_out_of_stock = true %}
         {% endif %}
+      {% endif %}
+      {% assign plist_hide_add_btn = false %}
+      {% if plist_disable_no_stock and plist_has_variants == false and plist_is_out_of_stock %}
+        {% assign plist_hide_add_btn = true %}
+      {% endif %}
 
+      <a href="/products/{{ product.slug }}" class="ab-plist-card ab-reveal" style="animation-delay: {{ forloop.index | times: 0.04 }}s">
         <div class="ab-plist-media">
+          {% if plist_has_sale or plist_custom_badge != '' %}
+            <div class="ab-plist-badge-stack">
+              {% if plist_has_sale %}
+                {% assign discount = product.price | minus: product.sale_price | times: 100 | divided_by: product.price | floor %}
+                <span class="ab-plist-badge ab-sale-badge">-{{ discount }}%</span>
+              {% endif %}
+              {% if plist_custom_badge != '' %}
+                <span class="ab-plist-badge ab-product-custom-badge">{{ plist_custom_badge }}</span>
+              {% endif %}
+            </div>
+          {% endif %}
+          
           <img class="ab-plist-img-primary" src="{{ product.thumb }}" alt="{{ product.name }}" loading="lazy" />
           {% if product.images[0] %}
             <img class="ab-plist-img-hover" src="{{ product.images[0] }}" alt="{{ product.name }}" loading="lazy" />
           {% endif %}
-          {% comment %} Wishlist & Compare action buttons — dispatch custom events caught by the storefront JS layer
-          <div class="ab-card-actions">
-            <button
-              class="ab-wishlist-btn"
-              type="button"
-              aria-label="Add to wishlist"
-              onclick="event.preventDefault();event.stopPropagation();this.dispatchEvent(new CustomEvent('toggle-wishlist',{bubbles:true,detail:{productId:'{{ product.id }}'}}));"
-            >
-              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"/></svg>
-            </button>
+          {% unless plist_hide_add_btn %}
             <button
-              class="ab-compare-btn"
+              class="ab-plist-add-btn"
               type="button"
-              aria-label="Compare"
-              onclick="event.preventDefault();event.stopPropagation();this.dispatchEvent(new CustomEvent('toggle-compare',{bubbles:true,detail:{productId:'{{ product.id }}'}}));"
-            >
-              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="16 3 21 8 16 13"/><line x1="21" y1="8" x2="9" y2="8"/><polyline points="8 21 3 16 8 11"/><line x1="3" y1="16" x2="15" y2="16"/></svg>
-            </button>
-          </div>
-          {% endcomment %}
-          <button
-            class="ab-plist-add-btn"
-            type="button"
-            aria-label="Add to cart"
-            onclick="event.preventDefault();event.stopPropagation();this.dispatchEvent(new CustomEvent('quick-add',{bubbles:true,detail:{productId:'{{ product.id }}'}}));"
-          ></button>
+              aria-label="Add to cart"
+              onclick="event.preventDefault();event.stopPropagation();this.dispatchEvent(new CustomEvent('quick-add',{bubbles:true,detail:{productId:'{{ product.id }}'}}));"
+            ></button>
+          {% endunless %}
         </div>
 
         <div class="ab-plist-info">
           <p class="ab-plist-name">{{ product.name }}</p>
+          
           <div class="ab-plist-price-row">
             {% if product.sale_price and product.sale_price < product.price %}
               <span class="ab-price-old">{{ product.price }} {{ currency }}</span>
@@ -91,3 +122,15 @@
     {% endfor %}
   </div>
 </section>
+
+ 
+
+<style>
+.ab-plist-price-row {
+    display: flex !important;
+    align-items: baseline !important;
+    gap: 8px !important;
+ }
+ 
+
+</style>

package/dist/template/theme/sections/order-invoice.liquid

@@ -1,8 +1,5 @@
 <div class="ab-invoice">
   <div class="ab-invoice-header">
-    {% if logo and logo != "" %}
-      <img class="ab-invoice-logo" src="{{ logo }}" alt="{{ store_name }}" />
-    {% endif %}
     <button
       class="ab-invoice-track-btn"
       type="button"
@@ -12,77 +9,8 @@
   </div>
 
   <div class="ab-invoice-body">
-    <div class="ab-invoice-sidebar">
-      {% if has_contact %}
-        <address class="ab-invoice-store-info">
-          <h3 class="ab-invoice-store-name">{{ store_name }}</h3>
-          <span class="ab-invoice-contact-row">
-            {% if contact_phone and contact_phone != "" %}
-              <a href="tel:{{ contact_phone }}">
-                <span class="ab-invoice-contact-label">{{ t_phone }}:</span> {{ contact_phone }}
-              </a>
-            {% endif %}
-            {% if contact_email and contact_email != "" %}
-              <a href="mailto:{{ contact_email }}">
-                <span class="ab-invoice-contact-label">{{ t_email }}:</span> {{ contact_email }}
-              </a>
-            {% endif %}
-          </span>
-          {% if contact_address and contact_address != "" %}
-            <span>
-              <span class="ab-invoice-contact-label">{{ t_address }}:</span> {{ contact_address }}
-            </span>
-          {% endif %}
-        </address>
-      {% endif %}
-
-      <div class="ab-invoice-shipping">
-        <h3 class="ab-invoice-section-title">{{ t_shipping_details }}</h3>
-        <dl class="ab-invoice-dl">
-          <div class="ab-invoice-dl-row">
-            <dt>{{ t_name }}:</dt>
-            <dd>{{ order.full_name }}</dd>
-          </div>
-          <div class="ab-invoice-dl-row">
-            <dt>{{ t_phone }}:</dt>
-            <dd>{{ order.phone }}</dd>
-          </div>
-          {% if order.email and order.email != "" %}
-            <div class="ab-invoice-dl-row">
-              <dt>{{ t_email }}:</dt>
-              <dd>{{ order.email }}</dd>
-            </div>
-          {% endif %}
-          {% if order.country and order.country != "" %}
-            <div class="ab-invoice-dl-row">
-              <dt>{{ t_country }}:</dt>
-              <dd>{{ order.country }}</dd>
-            </div>
-          {% endif %}
-          {% if order.government and order.government != "" %}
-            <div class="ab-invoice-dl-row">
-              <dt>{{ t_government }}:</dt>
-              <dd>{{ order.government }}</dd>
-            </div>
-          {% endif %}
-          {% if order.address and order.address != "" %}
-            <div class="ab-invoice-dl-row">
-              <dt>{{ t_address }}:</dt>
-              <dd>{{ order.address }}</dd>
-            </div>
-          {% endif %}
-          <div class="ab-invoice-dl-row">
-            <dt>{{ t_payment_details }}:</dt>
-            <dd>{{ order.payment_method }}</dd>
-          </div>
-          {% if order.transfer_receipt and order.transfer_receipt != "" %}
-            <div class="ab-invoice-dl-row ab-invoice-dl-row-center">
-              <img src="{{ order.transfer_receipt }}" alt="Transfer Receipt" class="ab-invoice-receipt-img" />
-            </div>
-          {% endif %}
-        </dl>
-      </div>
-
+    <div class="ab-invoice-main">
+      
       <div class="ab-invoice-timeline">
         <ul class="ab-invoice-notes-list">
           <li>
@@ -97,13 +25,6 @@
           {% endfor %}
         </ul>
       </div>
-    </div>
-
-    <div class="ab-invoice-main">
-      <div class="ab-invoice-status-row">
-        <span class="ab-invoice-status-label">{{ t_order_status }}:</span>
-        <span class="ab-invoice-status-value">{{ order.status_label }}</span>
-      </div>
 
       <div class="ab-invoice-items">
         {% for item in order.cart_items %}
@@ -118,15 +39,40 @@
               {% endif %}
               <p class="ab-invoice-item-qty">{{ t_items_count }}: {{ item.quantity }}</p>
               <p class="ab-invoice-item-unit-price">{{ t_piece_price }}: {{ item.price }} {{ currency }}</p>
-              {% if item.metadata_html and item.metadata_html != "" %}
-                <div class="ab-invoice-item-metadata">{{ item.metadata_html }}</div>
-              {% endif %}
             </div>
             <span class="ab-invoice-item-total">{{ t_total }} {{ item.total }} {{ currency }}</span>
           </div>
         {% endfor %}
       </div>
 
+      <div class="ab-invoice-shipping">
+        <h3 class="ab-invoice-section-title">{{ t_shipping_details }}</h3>
+        <dl class="ab-invoice-dl">
+          <div class="ab-invoice-dl-row">
+            <dt>{{ t_name }}:</dt>
+            <dd>{{ order.full_name }}</dd>
+          </div>
+          <div class="ab-invoice-dl-row">
+            <dt>{{ t_phone }}:</dt>
+            <dd>{{ order.phone }}</dd>
+          </div>
+          {% if order.email and order.email != "" %}
+            <div class="ab-invoice-dl-row">
+              <dt>{{ t_email }}:</dt>
+              <dd>{{ order.email }}</dd>
+            </div>
+          {% endif %}
+          <div class="ab-invoice-dl-row">
+            <dt>{{ t_address }}:</dt>
+            <dd>{{ order.address }}</dd>
+          </div>
+          <div class="ab-invoice-dl-row">
+            <dt>{{ t_payment_details }}:</dt>
+            <dd>{{ order.payment_method }}</dd>
+          </div>
+        </dl>
+      </div>
+
       <div class="ab-invoice-totals">
         <div class="ab-invoice-dl-row">
           <dt>{{ t_product_total }}:</dt>
@@ -138,17 +84,19 @@
             <dd>{% if order.shipping_cost %}{{ order.shipping_cost }} {{ currency }}{% else %}{{ t_free_shipping }}{% endif %}</dd>
           </div>
         {% endunless %}
-        {% if order.coupon_code and order.coupon_code != "" %}
-          <div class="ab-invoice-dl-row">
-            <dt>{{ t_coupon_code }}: {{ order.coupon_code }}</dt>
-            <dd>{{ order.coupon_discount }} {{ currency }}</dd>
-          </div>
-        {% endif %}
         <div class="ab-invoice-dl-row ab-invoice-total-row">
           <dt>{{ t_total }}:</dt>
           <dd>{{ order.total_cost }} {{ currency }}</dd>
         </div>
       </div>
+
+      <div class="ab-invoice-status-row">
+        <span class="ab-invoice-status-label">{{ t_order_status }}:</span>
+        <span class="ab-invoice-status-value">{{ order.status_label }}</span>
+      </div>
+
     </div>
+
+     
   </div>
-</div>
+</div>

package/dist/template/theme/sections/product-description.liquid

@@ -1,24 +1,34 @@
 <div class="lq-desc-accordion">
   {% if description != "" %}
-    <div class="lq-desc-item" data-open="true">
-      <button class="lq-desc-toggle" type="button" aria-expanded="true">
-        <span>{{ description_label }}</span>
+    <div class="lq-desc-item" data-open="true"> <button class="lq-desc-toggle" type="button" aria-expanded="true"> <span>{{ description_label }}</span>
         <span class="lq-desc-chevron"></span>
       </button>
-      <div class="lq-desc-panel" style="display:block">
-        <div class="lq-desc-content product_description">
+      <div class="lq-desc-panel" style="display:block"> <div class="lq-desc-content product_description">
           <div class="ql-editor leading-10" style="text-align:start" dir="auto">{{ description }}</div>
         </div>
       </div>
     </div>
   {% endif %}
+  
+  {% for desc in product_theme_data.desc %}
+    <div class="lq-desc-item">
+      <button class="lq-desc-toggle" type="button" aria-expanded="false">
+        <span class="lq-desc-toggle-label">
+           <span>{{ desc.title_headline }}</span>
+        </span>
+        <span class="lq-desc-chevron"></span>
+      </button>
+      <div class="lq-desc-panel" style="display:none">
+        <div class="lq-desc-content">{{ desc.title_desc }}</div>
+      </div>
+    </div>
+  {% endfor %}
 
   {% for policy in policies %}
     <div class="lq-desc-item">
       <button class="lq-desc-toggle" type="button" aria-expanded="false">
         <span class="lq-desc-toggle-label">
-          <img src="{{ policy.icon }}" alt="" class="lq-desc-icon" />
-          <span>{{ policy.title }}</span>
+           <span>{{ policy.title }}</span>
         </span>
         <span class="lq-desc-chevron"></span>
       </button>
@@ -27,4 +37,4 @@
       </div>
     </div>
   {% endfor %}
-</div>
+</div>