cleaned up

fiori/app/fiori.html

@@ -28,7 +28,7 @@
 					navigationMode: "embedded"
 				},
 				"manage-orders": {
-					title: "Manage Orders",
+					title: "Order Books",
 					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",

fiori/app/orders/fiori-service.cds

@@ -1,13 +1,15 @@
-using AdminService from '@capire/bookshop/srv/admin-service';
+using OrdersService from '@capire/orders/srv/orders-service';
 
-annotate AdminService.Books with {
+annotate OrdersService.Books with {
 	price @Common.FieldControl: #ReadOnly;
 }
+
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Common
 //
-annotate AdminService.OrderItems with {
+annotate OrdersService.OrderItems with {
 	book @(
 		Common: {
 			Text: book.title,
@@ -22,7 +24,7 @@ annotate AdminService.OrderItems with {
 
 
 @odata.draft.enabled
-annotate AdminService.Orders with @(
+annotate OrdersService.Orders with @(
 	UI: {
 		////////////////////////////////////////////////////////////////////////////
 		//
@@ -83,9 +85,9 @@ annotate AdminService.Orders with @(
 
 
 
-//The enity types name is AdminService.my_bookshop_OrderItems
+//The enity types name is OrdersService.my_bookshop_OrderItems
 //The annotations below are not generated in edmx WHY?
-annotate AdminService.OrderItems with @(
+annotate OrdersService.OrderItems with @(
 	UI: {
 		HeaderInfo: {
 			TypeName: 'Order Item', TypeNamePlural: '	',

fiori/app/orders/webapp/manifest.json

@@ -3,12 +3,12 @@
 	"sap.app": {
 		"id": "orders",
 		"type": "application",
-		"title": "Manage Orders",
+		"title": "Order Books",
 		"description": "Sample Application",
 		"i18n": "i18n/i18n.properties",
 		"dataSources": {
-			"AdminService": {
-				"uri": "/admin/",
+			"OrdersService": {
+				"uri": "/orders/",
 				"type": "OData",
 				"settings": {
 					"odataVersion": "4.0"
@@ -33,7 +33,7 @@
 				"uri": "i18n/i18n.properties"
 			},
 			"": {
-				"dataSource": "AdminService",
+				"dataSource": "OrdersService",
 				"settings": {
                     "synchronizationMode": "None",
                     "operationMode": "Server",
@@ -140,7 +140,7 @@
                                 }
                             }
                         }
-                    }                    
+                    }
                 },
                 "AuthorsDetails": {
                     "type": "Component",

fiori/package.json

@@ -2,20 +2,14 @@
   "name": "@capire/fiori",
   "version": "1.0.0",
   "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
-  "license": "SAP SAMPLE CODE LICENSE",
   "dependencies": {
     "@capire/bookshop": "*",
+    "@capire/orders": "*",
     "@capire/common": "*"
   },
   "scripts": {
     "start": "cds run --in-memory?",
     "watch": "cds watch"
   },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      }
-    }
-  }
+  "license": "SAP SAMPLE CODE LICENSE"
 }

fiori/srv/admin-service.cds

@@ -1,5 +1,3 @@
 // Proxy for importing services from bookshop sample
 using from '@capire/bookshop/srv/admin-service';
-using from '@capire/bookshop/srv/cat-service';
-
 annotate AdminService with @impl:'srv/admin-service.js';