translations and cleanup

packages/bookshop/app/_i18n/i18n.properties

@@ -9,6 +9,7 @@ Name = Name
 AuthorName = Author's Name
 Authors = Authors
 Order = Order
+OrderItems = Order Items
 Orders = Orders
 Price = Price
 shippingAddress = Shipping Address

packages/bookshop/app/orders/fiori-service.cds

@@ -129,7 +129,7 @@ annotate AdminService.Orders with @(UI : {
     Facets                      : [
         {
             $Type  : 'UI.ReferenceFacet',
-            Label  : '{i18n>ShippingAddress}',
+            Label  : '{i18n>shippingAddress}',
             Target : '@UI.FieldGroup#ShippingAddress'
         },
         {

packages/bookshop/srv/admin-service.js

@@ -46,11 +46,12 @@ bupaSrv.on('sap/S4HANAOD/c532/BO/BusinessPartner/Changed', async msg => {
     const txExt = bupaSrv.transaction(msg)
     try {
       const remoteAddresses = await txExt.run(selectQl)
-      const qlsToUpdateDifferences = _qlsToUpdateDifferences(ownAddresses, remoteAddresses)
+      const qlsToUpdateDifferences = _qlsToUpdateDifferences(
+        ownAddresses,
+        remoteAddresses
+      )
       if (qlsToUpdateDifferences.length) {
-        await Promise.all(qlsToUpdateDifferences.map(ql =>
+        await Promise.all(qlsToUpdateDifferences.map(ql => tx.run(ql)))
-          tx.run(ql)
-        ))
       }
     } catch (e) {
       console.error(e)
@@ -58,7 +59,6 @@ bupaSrv.on('sap/S4HANAOD/c532/BO/BusinessPartner/Changed', async msg => {
   }
 })
 
-module.exports = cds.service.impl(function () {
 async function _readAddresses (req) {
   console.log('Addresses', ShippingAddresses)
   const BusinessPartner = req.user.id
@@ -82,21 +82,14 @@ module.exports = cds.service.impl(function () {
         SELECT.from(ShippingAddresses).where({
           AddressID: req.data.shippingAddress_AddressID,
           BusinessPartner
-          }))
+        })
-        if (response && response.length > 0) {
+      )
+      if (response && response.length === 1) {
         const tx = cds.transaction(req)
-          try {
         const qlStatement = INSERT.into(ShippingAddresses).entries(response)
         await tx.run(qlStatement)
-          } catch (e) {
-            // already in there
-          }
-        } else {
-          req.error('Shipping address not found.')
-        }
-      } catch (e) {
-        console.error(e)
       }
+    } catch (e) {}
   }
 }
 
@@ -123,6 +116,7 @@ module.exports = cds.service.impl(function () {
   }
 }
 
+module.exports = cds.service.impl(function () {
   this.before('CREATE', 'Orders', _reduceStock)
   this.before('PATCH', 'Orders', _fillAddress)
   this.on('READ', 'Addresses', _readAddresses)