Move to standard README and package-lock file

2020-03-24 11:17:23 +01:00
parent 23cc571d8a
commit 2bf65fb50f
6 changed files with 919 additions and 56 deletions
--- a/packages/bookshop/srv/admin-service.js
+++ b/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