@viur/shop-components 0.1.3 → 0.1.4

package/.github/workflows/npm-publish.yml

@@ -14,9 +14,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 22
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - name: Publish npm package
@@ -35,7 +35,7 @@ jobs:
         run: |
           echo "${{ contains(github.ref_name, 'dev') }}"
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         # if: "!startsWith(github.ref_name, 'v-test-')"
         with:
           generate_release_notes: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viur/shop-components",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Frontend Vue components for the shop module of ViUR",
   "repository": {
     "type": "git",

package/src/composables/cart.js

@@ -84,7 +84,7 @@ export function useCart() {
                     shipping_address_key,
                     shipping_key,
                     discount_key,
-                    project_data
+                    commission
                 } = {}){
 
         let data= {
@@ -97,8 +97,8 @@ export function useCart() {
             cart_key:cart_key ? cart_key : shopStore.state.cartRoot['key'],
         }
 
-        if (project_data) {
-          data.project_data = JSON.stringify(project_data)
+        if (commission) {
+          data.commission = commission
         }
 
         return Request.post(`${shopStore.state.shopApiUrl}/cart_update`, {

package/src/main.js

@@ -15,20 +15,26 @@ const ViurShopComponents = {
     let defaultLocale = options?.defaultLocale?options.defaultLocale:'de'
     let locale = options?.locale?options.locale:['de']
     let fallback = options?.fallback?options.fallback:'en'
+
+    let additionals = options?.additionals?options.additionals:{}
+
     app.use(createPinia());
 
     let messages = {}
     // fetch translations from server
-    let data = await getTranslations(locale)
+    let data = await getTranslations(locale,options?.pattern)
     for(const loc of locale){
+      let locAdditionals = additionals?.[loc]?additionals[loc]:{}
+
+
       if (loc === 'de'){
-        messages[loc] = { ...de_translations, ...de, ...data[loc]}
+        messages[loc] = { ...de_translations, ...de, ...locAdditionals, ...data[loc]}
       }else if (loc === 'fr'){
-        messages[loc] = { ...fr, ...data[loc]}
+        messages[loc] = { ...fr, ...locAdditionals, ...data[loc]}
       }else if (loc === 'en'){
-        messages[loc] = {...en_translations, ...en, ...data[loc]}
+        messages[loc] = {...en_translations, ...en, ...locAdditionals, ...data[loc]}
       }else{
-        messages[loc] = {...data[loc]}
+        messages[loc] = {...locAdditionals, ...data[loc]}
       }
     }
 

package/src/translations/de.js

@@ -24,7 +24,7 @@ export default {
         "pay":"Bezahlen",
         "add_discount":"Hinzufügen",
         "add_discount_placeholder":"Dein Rabattcode",
-        "use_shipping_as_billing_address": "Rechnungsadresse zur Lieferungadresse",
+        "use_shipping_as_billing_address": "Lieferung zur Rechnungsadresse",
         "no_valid_shipping_found":"Keine passenden Versandarten gefunden.",
         "error_message":"Eine Fehler ist aufgetreten.",
         "free_shipping":"Versandkostenfrei",

package/src/translations/fr.js

@@ -33,10 +33,10 @@ export default {
         "summary_subtotal":"Sous-total",
         "summary_shipping_total":"Emballage et envoi",
         "summary_delivery_time":"",
-        "summary_discount":"",
-        "summary_checkout":"",
+        "summary_discount":"Vous économisez sur votre achat",
+        "summary_checkout":"Acheter cet article",
         "summary_total":"Montant total",
-        "summary_vat":"TVA incluse",
+        "summary_vat":"TVA incluse ({vat_percentage})",
         "discount_not_found": "Ce code promo n’existe pas.",
         "discount_not_active": "Ce code promo n’est pas actif.",
         "discount_not_available": "Ce code promo n’est pas valable pour ce pays.",

package/src/utils.js

@@ -20,13 +20,16 @@ export function struct2dict(structure) {
   return result;
 }
 
-export async function getTranslations(languages=["de"]){
+export async function getTranslations(languages=["de"],pattern=null){
   // fetch translations from server
   let retVal = languages.reduce((acc,item)=>{acc[item]={}; return acc;},{})
   try {
-    let translations = await Request.get("/json/_translation/get_public",{dataObj:{
-        languages:languages
-      }})
+    let dataObj = {languages:languages}
+    if(pattern){
+      dataObj['pattern'] = pattern
+    }
+
+    let translations = await Request.get("/json/_translation/get_public",{dataObj:dataObj})
     const data = await translations.json()
     for (let country in data) {
       data[country] = Object.fromEntries(