diff --git a/simplified_pos/__manifest__.py b/simplified_pos/__manifest__.py index 2dff409cc..ad95b803e 100644 --- a/simplified_pos/__manifest__.py +++ b/simplified_pos/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################### { 'name': 'Simplified POS', - 'version': '16.0.1.0.0', + 'version': '16.0.1.1.0', 'category': 'Point of Sale', 'summary': 'All aspects of POS on a single page.', 'description': 'A straightforward point-of-sale system that enables ' @@ -39,7 +39,6 @@ 'simplified_pos/static/src/js/ConfirmationPopup.js', 'simplified_pos/static/src/js/PrintPopup.js', 'simplified_pos/static/src/js/ProductScreenPaymentLine.js', - 'simplified_pos/static/src/js/ProductWidgetSimple.js', 'simplified_pos/static/src/scss/pos.scss', 'simplified_pos/static/src/xml/ProductScreen.xml', 'simplified_pos/static/src/xml/OrderWidget.xml', diff --git a/simplified_pos/doc/RELEASE_NOTES.md b/simplified_pos/doc/RELEASE_NOTES.md index 93708f28b..7e0659897 100644 --- a/simplified_pos/doc/RELEASE_NOTES.md +++ b/simplified_pos/doc/RELEASE_NOTES.md @@ -4,3 +4,9 @@ #### ADD - Initial commit for Simplified POS + +#### 07.02.2024 +#### Version 16.0.1.1.0 +#### UPDT + +- Updated Simplified POS to include control buttons and invoice button. Fixed the style Issues. diff --git a/simplified_pos/static/description/assets/screenshots/1.png b/simplified_pos/static/description/assets/screenshots/1.png new file mode 100644 index 000000000..40110cf23 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/1.png differ diff --git a/simplified_pos/static/description/assets/screenshots/2.png b/simplified_pos/static/description/assets/screenshots/2.png new file mode 100644 index 000000000..8321f26d8 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/2.png differ diff --git a/simplified_pos/static/description/assets/screenshots/3.png b/simplified_pos/static/description/assets/screenshots/3.png new file mode 100644 index 000000000..375d3ec09 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/3.png differ diff --git a/simplified_pos/static/description/assets/screenshots/4.png b/simplified_pos/static/description/assets/screenshots/4.png new file mode 100644 index 000000000..ea97a6a2f Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/4.png differ diff --git a/simplified_pos/static/description/assets/screenshots/5.png b/simplified_pos/static/description/assets/screenshots/5.png new file mode 100644 index 000000000..be2c4f92d Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/5.png differ diff --git a/simplified_pos/static/description/assets/screenshots/6.png b/simplified_pos/static/description/assets/screenshots/6.png new file mode 100644 index 000000000..495868285 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/6.png differ diff --git a/simplified_pos/static/description/assets/screenshots/7.png b/simplified_pos/static/description/assets/screenshots/7.png new file mode 100644 index 000000000..cef6f95c6 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/7.png differ diff --git a/simplified_pos/static/description/assets/screenshots/8.png b/simplified_pos/static/description/assets/screenshots/8.png new file mode 100644 index 000000000..fa9356689 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/8.png differ diff --git a/simplified_pos/static/description/assets/screenshots/9.png b/simplified_pos/static/description/assets/screenshots/9.png new file mode 100644 index 000000000..289b24df4 Binary files /dev/null and b/simplified_pos/static/description/assets/screenshots/9.png differ diff --git a/simplified_pos/static/description/assets/screenshots/hero.gif b/simplified_pos/static/description/assets/screenshots/hero.gif index 729771455..0dd842c4a 100644 Binary files a/simplified_pos/static/description/assets/screenshots/hero.gif and b/simplified_pos/static/description/assets/screenshots/hero.gif differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_01.png b/simplified_pos/static/description/assets/screenshots/s_pos_01.png deleted file mode 100644 index 555dfac12..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_01.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_02.png b/simplified_pos/static/description/assets/screenshots/s_pos_02.png deleted file mode 100644 index d7d3f2a6d..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_02.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_03.png b/simplified_pos/static/description/assets/screenshots/s_pos_03.png deleted file mode 100644 index e21a2d3c4..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_03.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_04.png b/simplified_pos/static/description/assets/screenshots/s_pos_04.png deleted file mode 100644 index ae218764b..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_04.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_05.png b/simplified_pos/static/description/assets/screenshots/s_pos_05.png deleted file mode 100644 index c57abf255..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_05.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_06.png b/simplified_pos/static/description/assets/screenshots/s_pos_06.png deleted file mode 100644 index c5a4f0628..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_06.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_07.png b/simplified_pos/static/description/assets/screenshots/s_pos_07.png deleted file mode 100644 index ea2625af7..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_07.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_08.png b/simplified_pos/static/description/assets/screenshots/s_pos_08.png deleted file mode 100644 index ab39944b3..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_08.png and /dev/null differ diff --git a/simplified_pos/static/description/assets/screenshots/s_pos_09.png b/simplified_pos/static/description/assets/screenshots/s_pos_09.png deleted file mode 100644 index 1acb82b4b..000000000 Binary files a/simplified_pos/static/description/assets/screenshots/s_pos_09.png and /dev/null differ diff --git a/simplified_pos/static/description/index.html b/simplified_pos/static/description/index.html index 6b7ba8ee7..0d7825ea8 100644 --- a/simplified_pos/static/description/index.html +++ b/simplified_pos/static/description/index.html @@ -165,7 +165,7 @@

This is the new point of sale frame.

- +
@@ -174,7 +174,7 @@

We can search for products here.

- +
@@ -186,7 +186,7 @@ clicked, it is added to the order lines and the total is displayed beneath it. We can adjust the amount, price, and discount using the number pad.

- +
@@ -197,16 +197,17 @@ We can select the necessary payment options, which can be shown beneath the summary.

- +

- Choose Customer

+ Choose Customer, Invoice

- By pressing the search - button, we may choose a customer.

- + By pressing the search button, you can choose a customer. + Additionally, if you want to generate an invoice, + simply click the invoice button.

+
@@ -215,7 +216,7 @@

Click this to validate the order.

- +
@@ -224,7 +225,7 @@

Click confirm to confirm order else click cancel.

- +
@@ -233,7 +234,7 @@

Click print to print the order.

- +
@@ -242,7 +243,7 @@

To access the new order, click New Order.

- +
diff --git a/simplified_pos/static/src/js/ProductScreen.js b/simplified_pos/static/src/js/ProductScreen.js index bbf891c57..58b72096a 100644 --- a/simplified_pos/static/src/js/ProductScreen.js +++ b/simplified_pos/static/src/js/ProductScreen.js @@ -80,6 +80,11 @@ odoo.define('point_of_sale.customer', function (require) { _selectLine(event) { this.env.pos.selectedOrder.select_orderline(event.detail.orderline); } + toggleIsToInvoice() { + // click_invoice + this.currentOrder.set_to_invoice(!this.currentOrder.is_to_invoice()); + this.render(true); + } } Registries.Component.extend(ProductScreen, CustomerButtons); diff --git a/simplified_pos/static/src/js/ProductWidgetSimple.js b/simplified_pos/static/src/js/ProductWidgetSimple.js deleted file mode 100644 index df794334d..000000000 --- a/simplified_pos/static/src/js/ProductWidgetSimple.js +++ /dev/null @@ -1,24 +0,0 @@ -odoo.define('point_of_sale.ProductsWidgetSimple', function (require) { - 'use strict'; - const Registries = require('point_of_sale.Registries'); - const ProductsWidget = require('point_of_sale.ProductsWidget'); - const ProductsWidgetSimple = (ProductsWidget) => - class extends ProductsWidget { - setup() { - super.setup(); - } - get productsToDisplay() { - /* This function is override to remove products showing before hand.*/ - let list = []; - if (this.searchWord !== '') { - list = this.env.pos.db.search_product_in_category( - this.selectedCategoryId, - this.searchWord - ); - } - return list.sort(function (a, b) { return a.display_name.localeCompare(b.display_name) }); - } - }; - Registries.Component.extend(ProductsWidget, ProductsWidgetSimple); - return ProductsWidgetSimple; -}); \ No newline at end of file diff --git a/simplified_pos/static/src/scss/pos.scss b/simplified_pos/static/src/scss/pos.scss index 35305e659..396f90e11 100644 --- a/simplified_pos/static/src/scss/pos.scss +++ b/simplified_pos/static/src/scss/pos.scss @@ -1,34 +1,34 @@ .pos .leftpane { background: $gray-200; float:left; - height: 98%; + height: 100%; display: flex; flex-direction: column; flex-grow: 1; - width:30%; - border: solid 5px teal;; + width:40%; + max-height: 94vh; + max-width: 65vh; + border: solid 5px teal; &::-webkit-scrollbar { width: 0; } } -.pos .subwindow .subwindow-container-fix { - height: 100%; - position: relative; - overflow-y: scroll;; - &::-webkit-scrollbar { - width: 0; - } -} .pos .products-widget { display: flex; flex-direction: column; flex-grow: 1; height:100%; + border :solid 1px teal; overflow: hidden;; &::-webkit-scrollbar { width: 0; } } + +.pos .order { + max-width: none; +} + .pos .order .orderlines { &::-webkit-scrollbar { width: 0; @@ -40,11 +40,17 @@ .payment-status-container { margin-top: 70px !important; } +.pos .right .invoice-btn { + display: flex; + justify-content: center; +} +.pos .right .invoice-btn .highlight { + width: 65% !important; +} .paymentlines-container { height: 29% !important; } .nextorder{ - margin-bottom:8px !important; width:29% !important; } .pos .product-list-container .product-list-empty p { @@ -62,9 +68,18 @@ grid-template-columns: repeat(4, 1fr); text-align: center; flex-grow: 1; - width: 100%; + width: 65%; min-width: 216px; } +.pos .control-buttons { + display: grid; + flex-grow: 1; + width: 35%; + border :solid 1px teal; +} +.pos .leftpane .control-buttons .control-button { + flex:1 1 100%; +} .pos .numpad button { border-color:teal; color:teal; @@ -89,11 +104,9 @@ float:right; background:white; width:30%; - height: 98.9%; + height: 100%; border: solid 5px teal; - box-sizing: border-box; - margin-top: 2px; - margin-bottom: 8px; + max-height: 94vh; } .pos .customer-button{ width: 65%; @@ -109,6 +122,9 @@ .pos .center{ background:white; height: 100%; + border: solid 5px teal; + border-top:none; + max-height: 94vh; } .pos ._o_customer{ text-align: justify; @@ -148,18 +164,21 @@ font-size: 25px; padding-top: 15px; } + .pos .button.validation { display: flex; align-items: center; justify-content: center; flex-direction: column; - height: calc(var(--btn-height-size) * 2.3); border: none; background: $primary; color: #fff; font-size: 14px; font-weight: bold; transition: all 150ms linear; + height:16%; + border-bottom: solid 5px teal !important; + } .pos .amount-paymentmethod{ padding-left: 40%; @@ -179,14 +198,10 @@ } .pos .button.validation{ background:#39B8B8 !important; - margin-bottom: 13px !important; } .highlight { width: 29.45% !important; } -.next { - border-bottom: solid 5px teal !important; -} .paymentmethods-container { overflow: scroll; height: 49.125%; @@ -198,6 +213,8 @@ position: absolute; width: 28.3%; bottom: 0; + padding-right: 0.6rem; + } .pos .search-bar-container.sb-product { max-width: 100%; diff --git a/simplified_pos/static/src/xml/OrderWidget.xml b/simplified_pos/static/src/xml/OrderWidget.xml index d2da2d4cb..a1627a184 100644 --- a/simplified_pos/static/src/xml/OrderWidget.xml +++ b/simplified_pos/static/src/xml/OrderWidget.xml @@ -4,8 +4,7 @@ - + diff --git a/simplified_pos/static/src/xml/ProductScreen.xml b/simplified_pos/static/src/xml/ProductScreen.xml index 080c1b25b..9f90047ea 100644 --- a/simplified_pos/static/src/xml/ProductScreen.xml +++ b/simplified_pos/static/src/xml/ProductScreen.xml @@ -6,9 +6,24 @@
- +
+ +
+ +
More...
+
+ + + + + +
+
+

CUSTOMER



@@ -20,7 +35,16 @@ t-on-click="customerdetails"> + +
+ +
@@ -76,5 +100,6 @@
+ \ No newline at end of file