Move to standard README and package-lock file

README.md

@@ -25,11 +25,20 @@ npm install
 Now you're ready to run the samples, for example:
 ```sh
 cd packages/bookshop
+cds deploy
 cds watch
 ```
 
 After that, watch out for the little popup in the lower right corner of SAP Business Application Studio that asks you to open the application in your browser.
 
+## Hints
+- If your demo user logon window does not show up:  clear the browsers login data
+- If your port is still in use run in your terminal:
+```
+> pkill node      //kill running node process
+```
+
+## Deploy to Cloud Foundry
 
 ## Get Support
 

package.json

@@ -1,4 +1,4 @@
- {
+{
   "name": "@sap/capire-samples",
   "description": "The umbrella project for all samples to easily setup for local development and tests.",
   "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",

packages/bookshop/srv/admin-service.cds

@@ -14,10 +14,6 @@ annotate AdminService.Orders with @odata.draft.enabled;
 extend service AdminService with {
   entity OrderItems as select from my.OrderItems;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3
 // Restrict access to orders to users with role "admin"
  annotate AdminService.Orders with  @(restrict: [
    { grant: 'READ', to: 'admin' } 

packages/bookshop/srv/admin-service.js

@@ -1,15 +1,5 @@
 /** Service implementation for AdminService */
 module.exports = cds.service.impl(function() {
-<<<<<<< HEAD
-  this.before ('CREATE', 'Orders', _checkOrderCreateAuth)
-})
-
-
-/** Check authorization  */
-function _checkOrderCreateAuth (req) {
-  req.user.currency[0] === req.data.currency_code || req.reject(403)
-}
-=======
     this.before ('CREATE', 'Orders', _checkOrderCreateAuth)
   })
   
@@ -18,4 +8,3 @@ function _checkOrderCreateAuth (req) {
   function _checkOrderCreateAuth (req) {
     req.user.currency[0] === req.data.currency_code || req.reject(403)
   }
->>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3