orionplace-nuxt 0.7.0 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionplace-nuxt",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Nuxt 4 storefront for your Orionplace marketplace: setup CLI, server API gateway, typed store and ready-made catalog, cart, checkout and account components in English and Russian, plus an Android app build.",
   "type": "module",
   "license": "MIT",

package/src/project-readme.mjs

@@ -579,11 +579,10 @@ out; the journal and other pages stay indexable. Leave it empty on a live shop.
 
 Every product page carries schema.org product data for Google and Yandex: the
 price, the crossed-out old price, stock, photos, brand, seller, rating and the
-return terms the page shows. To include the return terms, set
-\`ORIONPLACE_SHIPPING_COUNTRIES\` in \`.env\` to the countries you ship to, as
-ISO codes separated by spaces, for example
-\`ORIONPLACE_SHIPPING_COUNTRIES="RU BY"\`; without it the return terms are left
-out. The delivery cost is not included: it depends on the buyer's address.
+return terms the page shows. The return terms name the shop's shipping
+countries, which Application Load sends in \`init.shipping_countries\`; without
+a shipping country they are left out. The delivery cost is not included: it
+depends on the buyer's address.
 
 This setup does not add analytics.
 

package/templates/app/interfaces/orionplace/appBase/IAppLoadCommon.ts

@@ -24,6 +24,8 @@ export interface IAppLoadCommon {
 	weights: Record<string, IAppLoadCommonUnit>;
 	lengths: Record<string, IAppLoadCommonUnit>;
 	geo_location_enabled: boolean;
+	/** ISO codes of the shop's shipping countries, sorted. */
+	shipping_countries?: string[];
 	is_authenticated: boolean;
 	wallet?: Record<string, IAppLoadCommonWalletValue>;
 	logos: IAppLoadCommonLogos;

package/templates/app/pages/product/[id].vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import { useOrionplaceStore } from '@/stores/orionplace';
   import { computed, ref, watch } from 'vue';
-  import { navigateTo, useRoute, useState } from '#imports';
+  import { navigateTo, useRoute } from '#imports';
   import { useOrionplacePageSeo } from '@/composables/useOrionplacePageSeo';
   import { useOrionplaceMissingPage } from '@/composables/useOrionplaceMissingPage';
   import { useOrionplaceServerData } from '@/composables/useOrionplaceServerData';
@@ -71,13 +71,6 @@
     return images?.full?.[0] ?? images?.small?.[0];
   });
 
-  // ORIONPLACE_SHIPPING_COUNTRIES from the server's .env, for the return
-  // terms in the page's schema.org data; the browser reuses the value.
-  const shippingCountries = useState('orionplace:shipping-countries', () =>
-    shippingCountryCodes(
-      import.meta.server ? process.env.ORIONPLACE_SHIPPING_COUNTRIES : '',
-    ),
-  );
   const productName      = computed(() =>
     getAvailableNestedValueFromObject(
       product.value?.locale,
@@ -113,7 +106,10 @@
         description: productSummary.value,
         currencyId: store.currencyId,
         currencyCode: store.currentCurrency?.currency_code,
-        shippingCountries: shippingCountries.value,
+        // The backend's shipping countries, for the return terms.
+        shippingCountries: shippingCountryCodes(
+          store.init?.shipping_countries,
+        ),
         showSeller: !store.init?.visual_settings?.single_seller_mode,
         absoluteUrl: (value) => storefrontAbsoluteUrl(value, origin),
       }),

package/templates/app/utils/orionplace/productStructuredData.ts

@@ -45,7 +45,7 @@ export interface StorefrontProductDataOptions {
   /** The currency the page shows prices in (its ID and code). */
   currencyId: string;
   currencyCode: string | undefined;
-  /** ORIONPLACE_SHIPPING_COUNTRIES, parsed by shippingCountryCodes(). */
+  /** App Load `init.shipping_countries`, parsed by shippingCountryCodes(). */
   shippingCountries: string[];
   /** False when the page hides the seller (single-seller storefront). */
   showSeller: boolean;
@@ -54,11 +54,12 @@ export interface StorefrontProductDataOptions {
 }
 
 /**
- * The countries the shop ships to, from ORIONPLACE_SHIPPING_COUNTRIES:
- * ISO 3166-1 alpha-2 codes separated by spaces or commas, e.g. "RU BY".
+ * The countries the shop ships to: App Load `init.shipping_countries` (the
+ * backend's countries marked as shipping countries), as valid ISO 3166-1
+ * alpha-2 codes.
  */
 export function shippingCountryCodes(value: unknown): string[] {
-  const codes = String(value ?? '')
+  const codes = (Array.isArray(value) ? value.join(' ') : String(value ?? ''))
     .split(/[\s,;]+/)
     .map((code) => code.trim().toUpperCase())
     .filter((code) => /^[A-Z]{2}$/.test(code));