Merge branch 'D-kom-Demo' of https://github.com/SAP-samples/cloud-cap-samples into D-kom-Demo

packages/bookshop/app/_i18n/i18n.properties

@@ -14,3 +14,5 @@ Price = Price
 ShippingAddress = Shipping Address
 HouseNumber = House Number
 StreetName = Street Name
+PostalCode = Postal Code
+Country = Country

packages/bookshop/app/common.cds

@@ -77,5 +77,7 @@ annotate my.ShippingAddresses with {
 	AddressID @title:'{i18n>AddressID}';
 	CityName @title:'{i18n>CityName}';
 	StreetName @title:'{i18n>StreetName}';
+	PostalCode @title:'{i18n>PostalCode}';
+	Country @title:'{i18n>Country}';
 	HouseNumber @title:'{i18n>HouseNumber}';
 }

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

@@ -109,7 +109,8 @@ annotate AdminService.Orders with @(
 				{Value: shippingAddress_AddressID, Label:'{i18n>ShippingAddress}'},
 				{Value: shippingAddress.HouseNumber, Label:'{i18n>HouseNumber}'},
 				{Value: shippingAddress.StreetName, Label:'{i18n>StreetName}'},
-				{Value: shippingAddress.CityName, Labe:'{i18n>CityName}'}
+				{Value: shippingAddress.CityName, Labe:'{i18n>CityName}'},
+				{Value: shippingAddress.PostalCode, Label:'{i18n>PostalCode}'},
 			]
 		},
 	},

packages/bookshop/db/schema.cds

@@ -44,7 +44,9 @@ entity OrderItems : cuid {
 // TODO: Use external information
 entity ShippingAddresses  {
   key AddressID: String;
+  Country: String @readonly;
   CityName: String @readonly;
+  PostalCode: String @readonly;
   StreetName: String @readonly;
   HouseNumber: String @readonly;
 }

packages/bookshop/srv/admin-service.js

@@ -4,6 +4,8 @@ const RELEVANT_ADDRESS_COLUMNS = [
   'AddressID',
   'CityName',
   'StreetName',
+  'PostalCode',
+  'Country',
   'HouseNumber'
 ]
 

packages/bookshop/srv/init.js

@@ -9,6 +9,8 @@ module.exports = db => {
       BusinessPartner: '1234567',
       AddressID: '11111',
       CityName: 'Walldorf',
+      PostalCode: '69190',
+      Country: 'Germany',
       StreetName: 'Dietmar-Hopp-Allee',
       HouseNumber: '16'
     },
@@ -16,13 +18,17 @@ module.exports = db => {
       BusinessPartner: '1234567',
       AddressID: '22222',
       CityName: 'St. Leon-Rot',
+      PostalCode: '68789',
+      Country: 'Germany',
       StreetName: 'SAP-Allee',
-      HouseNumber: '25'
+      HouseNumber: '25',
     },
     {
       BusinessPartner: '1003765',
       AddressID: '28241',
       CityName: 'Palo Alto',
+      PostalCode: '94306',
+      Country: 'United States',
       StreetName: 'Hillview Avenue',
       HouseNumber: '26'
     },
@@ -30,6 +36,8 @@ module.exports = db => {
       BusinessPartner: '1003766',
       AddressID: '28244',
       CityName: 'Hallbergmoos',
+      PostalCode: '85396',
+      Country: 'Germany',
       StreetName: 'Zeppelinstraße',
       HouseNumber: '93'
     },
@@ -37,6 +45,8 @@ module.exports = db => {
       BusinessPartner: '1003767',
       AddressID: '28247',
       CityName: 'Potsdam',
+      PostalCode: '14467',
+      Country: 'Germany',
       StreetName: 'Konrad-Zuse-Ring',
       HouseNumber: '29'
     }