From 9e2c7a0974150c21739b3984f475b9ea7a35a922 Mon Sep 17 00:00:00 2001
From: Elena Oresharova <elena.oresharova@sap.com>
Date: Tue, 3 Dec 2019 13:54:02 +0100
Subject: [PATCH] Add side effect of filling the fields of an address once we
 have a selection

---
 .../bookshop/app/orders/fiori-service.cds     | 20 ++++++++++---------
 packages/bookshop/srv/init.js                 |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/bookshop/app/orders/fiori-service.cds b/packages/bookshop/app/orders/fiori-service.cds
index 03ec577c..05d22c22 100644
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -30,6 +30,7 @@ annotate AdminService.Orders with {
 				SearchSupported: 'true',
 				Parameters: [
 					{ $Type: 'Common.ValueListParameterOut', LocalDataProperty: 'shippingAddress_AddressID', ValueListProperty: 'AddressID'},
+					{ $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'PostalCode'},
 					{ $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'CityName'},
 					{ $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'StreetName'},
 					{ $Type: 'Common.ValueListParameterDisplayOnly', ValueListProperty: 'HouseNumber'},
@@ -96,15 +97,6 @@ annotate AdminService.Orders with @(
 		},
 		// TODO: Trigger side effects when `shippingAddress_AddressID` is changed
 		FieldGroup#ShippingAddress: {
-    Common.SideEffects : {
-      EffectTypes      : #ValueChange,
-      SourceProperties : [shippingAddress_AddressID],
-      TargetProperties : [
-        shippingAddress.HouseNumber,
-        shippingAddress.StreetName,
-        shippingAddress.CityName
-      ]
-    },
 			Data: [
 				{Value: shippingAddress_AddressID, Label:'{i18n>ShippingAddress}'},
 				{Value: shippingAddress.HouseNumber, Label:'{i18n>HouseNumber}'},
@@ -114,6 +106,16 @@ annotate AdminService.Orders with @(
 			]
 		},
 	},
+  Common.SideEffects : {
+    EffectTypes      : #ValueChange,
+    SourceProperties : [shippingAddress_AddressID],
+    TargetProperties : [
+      shippingAddress.HouseNumber,
+      shippingAddress.StreetName,
+      shippingAddress.CityName,
+			shippingAddress.PostalCode
+    ]
+  },
 ) {
 	createdAt @UI.HiddenFilter:false;
 	createdBy @UI.HiddenFilter:false;
diff --git a/packages/bookshop/srv/init.js b/packages/bookshop/srv/init.js
index 9a1aafb8..728e9a84 100644
--- a/packages/bookshop/srv/init.js
+++ b/packages/bookshop/srv/init.js
@@ -21,7 +21,7 @@ module.exports = db => {
       PostalCode: '68789',
       Country: 'Germany',
       StreetName: 'SAP-Allee',
-      HouseNumber: '25',
+      HouseNumber: '25'
     },
     {
       BusinessPartner: '1003765',