Merge pull request #11 from StarkLiew/cleanup

Fixed Bug
StarkLiew · Mar 6, 2020 · bc5a57c · bc5a57c
2 parents 3153ee3 + afcc8d8
commit bc5a57c
Show file tree

Hide file tree

Showing 19 changed files with 79,383 additions and 54,671 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 .env
 .phpunit.result.cache
 .sublime-project
+.sublime-workspace
 Homestead.json
 Homestead.yaml
 npm-debug.log

diff --git a/package-lock.json b/package-lock.json
diff --git a/public/backoffice/app.js b/public/backoffice/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/backoffice/app.js": "/backoffice/app.js",
-    "/pos/app.js": "/pos/app.js",
     "/css/app.css": "/css/app.css",
+    "/pos/app.js": "/pos/app.js",
     "/receipt/app-client.js": "/receipt/app-client.js",
     "/receipt/app-server.js": "/receipt/app-server.js",
     "/js/fingerprint2.min.js": "/js/fingerprint2.min.js"

diff --git a/public/pos/app.js b/public/pos/app.js
@@ -81,7 +81,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -39412,7 +39412,7 @@ exports.push([module.i, "\nvideo[data-v-9c322c14] {\n    max-width: 100%;\n    m
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.v-navigation-drawer__content {\n    max-height: 100vh;\n}\n\n", ""]);
+exports.push([module.i, "\n.v-navigation-drawer__content {\r\n    max-height: 100vh;\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39426,7 +39426,7 @@ exports.push([module.i, "\n.v-navigation-drawer__content {\n    max-height: 100v
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n#edit-receipt-content {\n    min-height: calc(100vh - 54px);\n}\n#scroll-receipt-content {\n    min-height: calc(100vh - 54px - (54px + (56px * 7)));\n    max-height: calc(100vh - 54px - (54px + (56px * 7)));\n}\n#receipt-footer {\n    min-height: calc(100vh - (54px + (56px * 6)));\n    max-height: calc(100vh - (54px + (56px * 6)));\n}\n\n", ""]);
+exports.push([module.i, "\n#edit-receipt-content {\r\n    min-height: calc(100vh - 54px);\n}\n#scroll-receipt-content {\r\n    min-height: calc(100vh - 54px - (54px + (56px * 7)));\r\n    max-height: calc(100vh - 54px - (54px + (56px * 7)));\n}\n#receipt-footer {\r\n    min-height: calc(100vh - (54px + (56px * 6)));\r\n    max-height: calc(100vh - (54px + (56px * 6)));\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39440,7 +39440,7 @@ exports.push([module.i, "\n#edit-receipt-content {\n    min-height: calc(100vh -
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n@page {\n    size: 80mm auto;\n    margin: 5mm;\n}\n@media print {\n* {\n        width: 70mm;\n        height: auto;\n        padding: 0;\n        margin: 0;\n        list-style-type: none;\n        font-family: \"arial\";\n        font-size: 8px;\n}\n}\n.title, .subtitle-2 {\n    text-align: center;\n    font-weight: bold;\n}\n.caption {\n    font-weight: bold;\n}\ntable {\n    width: 100%;\n}\ntable th {\n    border: none;\n    border-bottom: 1px dashed #000;\n    padding: 1px;\n    text-align: right;\n}\ntable tr td {\n    border: none;\n    border-bottom: none;\n    border-right: none;\n    padding: 1px;\n    text-align: right;\n}\ntd.left,\nth.left {\n    text-align: left;\n}\ntd.line {\n    border-top: 1px dashed #000;\n}\ntd.center {\n      text-align: center;\n}\n\n", ""]);
+exports.push([module.i, "\n@page {\r\n    size: 80mm auto;\r\n    margin: 5mm;\n}\n@media print {\n* {\r\n        width: 70mm;\r\n        height: auto;\r\n        padding: 0;\r\n        margin: 0;\r\n        list-style-type: none;\r\n        font-family: \"arial\";\r\n        font-size: 8px;\n}\n}\n.title, .subtitle-2 {\r\n    text-align: center;\r\n    font-weight: bold;\n}\n.caption {\r\n    font-weight: bold;\n}\ntable {\r\n    width: 100%;\n}\ntable th {\r\n    border: none;\r\n    border-bottom: 1px dashed #000;\r\n    padding: 1px;\r\n    text-align: right;\n}\ntable tr td {\r\n    border: none;\r\n    border-bottom: none;\r\n    border-right: none;\r\n    padding: 1px;\r\n    text-align: right;\n}\ntd.left,\r\nth.left {\r\n    text-align: left;\n}\ntd.line {\r\n    border-top: 1px dashed #000;\n}\ntd.center {\r\n      text-align: center;\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39454,7 +39454,7 @@ exports.push([module.i, "\n@page {\n    size: 80mm auto;\n    margin: 5mm;\n}\n@
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.shake {\n    -webkit-animation: shake 0.82s cubic-bezier(.36, .07, .19, .97) both;\n            animation: shake 0.82s cubic-bezier(.36, .07, .19, .97) both;\n    transform: translate3d(0, 0, 0);\n    -webkit-backface-visibility: hidden;\n            backface-visibility: hidden;\n    perspective: 1000px;\n}\n@-webkit-keyframes shake {\n10%,\n    90% {\n        transform: translate3d(-1px, 0, 0);\n}\n20%,\n    80% {\n        transform: translate3d(2px, 0, 0);\n}\n30%,\n    50%,\n    70% {\n        transform: translate3d(-4px, 0, 0);\n}\n40%,\n    60% {\n        transform: translate3d(4px, 0, 0);\n}\n}\n@keyframes shake {\n10%,\n    90% {\n        transform: translate3d(-1px, 0, 0);\n}\n20%,\n    80% {\n        transform: translate3d(2px, 0, 0);\n}\n30%,\n    50%,\n    70% {\n        transform: translate3d(-4px, 0, 0);\n}\n40%,\n    60% {\n        transform: translate3d(4px, 0, 0);\n}\n}\n\n", ""]);
+exports.push([module.i, "\n.shake {\r\n    -webkit-animation: shake 0.82s cubic-bezier(.36, .07, .19, .97) both;\r\n            animation: shake 0.82s cubic-bezier(.36, .07, .19, .97) both;\r\n    transform: translate3d(0, 0, 0);\r\n    -webkit-backface-visibility: hidden;\r\n            backface-visibility: hidden;\r\n    perspective: 1000px;\n}\n@-webkit-keyframes shake {\n10%,\r\n    90% {\r\n        transform: translate3d(-1px, 0, 0);\n}\n20%,\r\n    80% {\r\n        transform: translate3d(2px, 0, 0);\n}\n30%,\r\n    50%,\r\n    70% {\r\n        transform: translate3d(-4px, 0, 0);\n}\n40%,\r\n    60% {\r\n        transform: translate3d(4px, 0, 0);\n}\n}\n@keyframes shake {\n10%,\r\n    90% {\r\n        transform: translate3d(-1px, 0, 0);\n}\n20%,\r\n    80% {\r\n        transform: translate3d(2px, 0, 0);\n}\n30%,\r\n    50%,\r\n    70% {\r\n        transform: translate3d(-4px, 0, 0);\n}\n40%,\r\n    60% {\r\n        transform: translate3d(4px, 0, 0);\n}\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39468,7 +39468,7 @@ exports.push([module.i, "\n.shake {\n    -webkit-animation: shake 0.82s cubic-be
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.v-navigation-drawer__content {\n    max-height: calc(100vh - (56px * 6));\n}\n\n", ""]);
+exports.push([module.i, "\n.v-navigation-drawer__content {\r\n    max-height: calc(100vh - (56px * 6));\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39482,7 +39482,7 @@ exports.push([module.i, "\n.v-navigation-drawer__content {\n    max-height: calc
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.lighttext {\n    background: rgba(0, 0, 0, 0.5);\n}\n\n", ""]);
+exports.push([module.i, "\n.lighttext {\r\n    background: rgba(0, 0, 0, 0.5);\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39496,7 +39496,7 @@ exports.push([module.i, "\n.lighttext {\n    background: rgba(0, 0, 0, 0.5);\n}\
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n@page {\n    size: 80mm auto;\n    margin: 5mm;\n}\n@media screen and print {\n* {\n        width: 70mm;\n        height: auto;\n        padding: 0;\n        margin: 0;\n        list-style-type: none;\n        font-family: \"arial\";\n        font-size: 8px;\n}\n.stamp {\n\n        font-weight: bold;\n        font-size: 30px;\n        position: fixed;\n        left: -12px;\n        top: -12px;\n        text-transform: uppercase;\n        transform: rotate(-45deg);\n}\n.title {\n        text-align: center;\n        font-weight: bold;\n}\n.caption {\n        font-weight: bold;\n}\ntable th {\n        border: none;\n        border-bottom: 1px dashed #000;\n        padding: 1px;\n        text-align: right;\n}\ntable tr td {\n        border: none;\n        border-bottom: none;\n        border-right: none;\n        padding: 1px;\n        text-align: right;\n}\ntd.left,\n    th.left {\n        text-align: left;\n}\ntd.line {\n        border-top: 1px dashed #000;\n}\n}\n\n", ""]);
+exports.push([module.i, "\n@page {\r\n    size: 80mm auto;\r\n    margin: 5mm;\n}\n@media screen and print {\n* {\r\n        width: 70mm;\r\n        height: auto;\r\n        padding: 0;\r\n        margin: 0;\r\n        list-style-type: none;\r\n        font-family: \"arial\";\r\n        font-size: 8px;\n}\n.stamp {\r\n\r\n        font-weight: bold;\r\n        font-size: 30px;\r\n        position: fixed;\r\n        left: -12px;\r\n        top: -12px;\r\n        text-transform: uppercase;\r\n        transform: rotate(-45deg);\n}\n.title {\r\n        text-align: center;\r\n        font-weight: bold;\n}\n.caption {\r\n        font-weight: bold;\n}\ntable th {\r\n        border: none;\r\n        border-bottom: 1px dashed #000;\r\n        padding: 1px;\r\n        text-align: right;\n}\ntable tr td {\r\n        border: none;\r\n        border-bottom: none;\r\n        border-right: none;\r\n        padding: 1px;\r\n        text-align: right;\n}\ntd.left,\r\n    th.left {\r\n        text-align: left;\n}\ntd.line {\r\n        border-top: 1px dashed #000;\n}\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -39510,7 +39510,7 @@ exports.push([module.i, "\n@page {\n    size: 80mm auto;\n    margin: 5mm;\n}\n@
 
 exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.input-right input {\n    text-align: right\n}\n\n", ""]);
+exports.push([module.i, "\n.input-right input {\r\n    text-align: right\n}\r\n\r\n", ""]);
 
 
 /***/ }),
@@ -158153,26 +158153,14 @@ var FETCH_APPOINTMENT_FAILURE = 'FETCH_APPOINTMENT_FAILURE';
 
 /***/ }),
 
-/***/ "./resources/styles/app.sass":
-/*!***********************************!*\
-  !*** ./resources/styles/app.sass ***!
-  \***********************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-// removed by extract-text-webpack-plugin
-
-/***/ }),
-
-/***/ 0:
-/*!****************************************************************!*\
-  !*** multi ./resources/pos/app.js ./resources/styles/app.sass ***!
-  \****************************************************************/
+/***/ 1:
+/*!************************************!*\
+  !*** multi ./resources/pos/app.js ***!
+  \************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! /var/www/resources/pos/app.js */"./resources/pos/app.js");
-module.exports = __webpack_require__(/*! /var/www/resources/styles/app.sass */"./resources/styles/app.sass");
+module.exports = __webpack_require__(/*! /var/www/resources/pos/app.js */"./resources/pos/app.js");
 
 
 /***/ })

diff --git a/public/receipt/app-client.js b/public/receipt/app-client.js
@@ -277,7 +277,7 @@ __webpack_require__.r(__webpack_exports__);
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n@page {\n    size: 80mm auto;\n    margin: 5mm;\n}\n@media screen and print {\n* {\n        width: 70mm;\n        height: auto;\n        padding: 0;\n        margin: 0;\n        list-style-type: none;\n        font-family: \"arial\";\n        font-size: 8px;\n}\n.stamp {\n\n        font-weight: bold;\n        font-size: 30px;\n        position: fixed;\n        left: -12px;\n        top: -12px;\n        text-transform: uppercase;\n        transform: rotate(-45deg);\n}\n.title {\n        text-align: center;\n        font-weight: bold;\n}\n.caption {\n        font-weight: bold;\n}\ntable th {\n        border: none;\n        border-bottom: 1px dashed #000;\n        padding: 1px;\n        text-align: right;\n}\ntable tr td {\n        border: none;\n        border-bottom: none;\n        border-right: none;\n        padding: 1px;\n        text-align: right;\n}\ntd.left,\n    th.left {\n        text-align: left;\n}\ntd.line {\n        border-top: 1px dashed #000;\n}\n}\n\n", ""]);
+exports.push([module.i, "\n@page {\r\n    size: 80mm auto;\r\n    margin: 5mm;\n}\n@media screen and print {\n* {\r\n        width: 70mm;\r\n        height: auto;\r\n        padding: 0;\r\n        margin: 0;\r\n        list-style-type: none;\r\n        font-family: \"arial\";\r\n        font-size: 8px;\n}\n.stamp {\r\n\r\n        font-weight: bold;\r\n        font-size: 30px;\r\n        position: fixed;\r\n        left: -12px;\r\n        top: -12px;\r\n        text-transform: uppercase;\r\n        transform: rotate(-45deg);\n}\n.title {\r\n        text-align: center;\r\n        font-weight: bold;\n}\n.caption {\r\n        font-weight: bold;\n}\ntable th {\r\n        border: none;\r\n        border-bottom: 1px dashed #000;\r\n        padding: 1px;\r\n        text-align: right;\n}\ntable tr td {\r\n        border: none;\r\n        border-bottom: none;\r\n        border-right: none;\r\n        padding: 1px;\r\n        text-align: right;\n}\ntd.left,\r\n    th.left {\r\n        text-align: left;\n}\ntd.line {\r\n        border-top: 1px dashed #000;\n}\n}\r\n\r\n", ""]);
 
 
 /***/ }),

diff --git a/public/receipt/app-server.js b/public/receipt/app-server.js
@@ -277,7 +277,7 @@ __webpack_require__.r(__webpack_exports__);
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n@page {\n    size: 80mm auto;\n    margin: 5mm;\n}\n@media screen and print {\n* {\n        width: 70mm;\n        height: auto;\n        padding: 0;\n        margin: 0;\n        list-style-type: none;\n        font-family: \"arial\";\n        font-size: 8px;\n}\n.stamp {\n\n        font-weight: bold;\n        font-size: 30px;\n        position: fixed;\n        left: -12px;\n        top: -12px;\n        text-transform: uppercase;\n        transform: rotate(-45deg);\n}\n.title {\n        text-align: center;\n        font-weight: bold;\n}\n.caption {\n        font-weight: bold;\n}\ntable th {\n        border: none;\n        border-bottom: 1px dashed #000;\n        padding: 1px;\n        text-align: right;\n}\ntable tr td {\n        border: none;\n        border-bottom: none;\n        border-right: none;\n        padding: 1px;\n        text-align: right;\n}\ntd.left,\n    th.left {\n        text-align: left;\n}\ntd.line {\n        border-top: 1px dashed #000;\n}\n}\n\n", ""]);
+exports.push([module.i, "\n@page {\r\n    size: 80mm auto;\r\n    margin: 5mm;\n}\n@media screen and print {\n* {\r\n        width: 70mm;\r\n        height: auto;\r\n        padding: 0;\r\n        margin: 0;\r\n        list-style-type: none;\r\n        font-family: \"arial\";\r\n        font-size: 8px;\n}\n.stamp {\r\n\r\n        font-weight: bold;\r\n        font-size: 30px;\r\n        position: fixed;\r\n        left: -12px;\r\n        top: -12px;\r\n        text-transform: uppercase;\r\n        transform: rotate(-45deg);\n}\n.title {\r\n        text-align: center;\r\n        font-weight: bold;\n}\n.caption {\r\n        font-weight: bold;\n}\ntable th {\r\n        border: none;\r\n        border-bottom: 1px dashed #000;\r\n        padding: 1px;\r\n        text-align: right;\n}\ntable tr td {\r\n        border: none;\r\n        border-bottom: none;\r\n        border-right: none;\r\n        padding: 1px;\r\n        text-align: right;\n}\ntd.left,\r\n    th.left {\r\n        text-align: left;\n}\ntd.line {\r\n        border-top: 1px dashed #000;\n}\n}\r\n\r\n", ""]);
 
 
 /***/ }),

diff --git a/public/service-worker.js b/public/service-worker.js
diff --git a/resources/backoffice/components/admin/product/Variant.vue b/resources/backoffice/components/admin/product/Variant.vue
@@ -146,8 +146,8 @@
 <script>
 import { mapGetters } from 'vuex'
 import Crud from '../shared/Crud'
+import Vue from 'vue'
 import AvatarCropper from 'vue-avatar-cropper'
-import Vue from 'Vue'
 import { swatches } from '~~/config'
 
 export default {

diff --git a/resources/backoffice/components/admin/service/Variant.vue b/resources/backoffice/components/admin/service/Variant.vue
@@ -137,8 +137,8 @@
 <script>
 import { mapGetters } from 'vuex'
 import Crud from '../shared/Crud'
+import Vue from 'vue'
 import AvatarCropper from 'vue-avatar-cropper'
-import Vue from 'Vue'
 import { durations, swatches } from '~~/config'
 
 export default {