diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 7653806..0000000 Binary files a/models/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/models/__pycache__/pos_config.cpython-35.pyc b/models/__pycache__/pos_config.cpython-35.pyc deleted file mode 100644 index 3792486..0000000 Binary files a/models/__pycache__/pos_config.cpython-35.pyc and /dev/null differ diff --git a/models/__pycache__/pos_transaction.cpython-35.pyc b/models/__pycache__/pos_transaction.cpython-35.pyc deleted file mode 100644 index df3de38..0000000 Binary files a/models/__pycache__/pos_transaction.cpython-35.pyc and /dev/null differ diff --git a/static/src/css/style.css b/static/src/css/style.css index 83a6075..cee502e 100644 --- a/static/src/css/style.css +++ b/static/src/css/style.css @@ -81,14 +81,16 @@ border-top: solid 3px rgb(110, 200, 155); } -.pos .scale-screen{ +.pos .scale-screen, .pos .balancecontainerscale-screen{ position: fixed; bottom: 0; top: inherit; z-index: 100; } +.pos .balancecontainerscale-screen .weight-brut, .pos .balancecontainerscale-screen .label-scale, .pos .scale-screen .weight-brut, .pos .scale-screen .label-scale, +.pos .balancecontainerscale-screen .label-scale-cont , .pos .scale-screen .label-scale-cont { font-size: 25px; margin: 35px 16px 0px 16px; @@ -97,15 +99,18 @@ /*width: 40%;*/ } +.pos .balancecontainerscale-screen .label-scale.margin-top, .pos .scale-screen .label-scale.margin-top{ /*margin: 50px 16px 0px 16px;*/ margin: 16px; } +.pos .label-scale-cont .label-scale-cont , .pos .scale-screen .label-scale-cont { margin: 0px 16px 0px 16px; } +.pos .balancecontainerscale-screen .add-container, .pos .scale-screen .add-transaction{ margin: 0 auto; text-align: center; @@ -115,10 +120,15 @@ border-radius: 0; padding: 16px; width: 200px; - margin: 0 auto; + margin: 40px auto; cursor: pointer; } +.pos .balancecontainerscale-screen .add-container{ + width: 250px; + margin: 40px auto; +} + .page-first { -webkit-flex: 1; flex: 1; @@ -182,6 +192,7 @@ h1.product-name { background-color: rgba(226, 240, 217, 0.5); } +.pos .balancecontainerscale-screen .computed-price, .pos .scale-screen .computed-price{ text-align: right; margin: 16px; @@ -196,6 +207,7 @@ h1.product-name { font-weight: normal; } +.pos .balancecontainerscale-screen .product-price, .pos .scale-screen .product-price { font-size: 25px; margin: 10px; diff --git a/static/src/js/container.js b/static/src/js/container.js index e041998..774a03f 100644 --- a/static/src/js/container.js +++ b/static/src/js/container.js @@ -617,6 +617,7 @@ odoo.define('vracoop_pos_free_balance_V2.container_balance', function (require) } $("#pos-header-text-peser").removeClass('oe_hidden'); + $("#pos-topheader-scale-cont").removeClass('oe_hidden'); }, @@ -624,6 +625,7 @@ odoo.define('vracoop_pos_free_balance_V2.container_balance', function (require) hide: function(){ this._super(); $("#pos-header-text-peser").addClass('oe_hidden'); + $("#pos-topheader-scale-cont").addClass('oe_hidden'); }, get_product: function(){ diff --git a/static/src/xml/pos.xml b/static/src/xml/pos.xml index 596325d..690d9c8 100644 --- a/static/src/xml/pos.xml +++ b/static/src/xml/pos.xml @@ -50,27 +50,67 @@ -
-
-
-
- - - Retour - +
+
+
+ + + Retour + +
+
+
    +
  • 1
    • +
  • 2. Peser le contenant et valider
    • +
  • 3
    • +
  • 4
    • +
  • 5
    • +
+
+
+
+
+
+
+

Ajouter un contenant

+
+ Sauvegarder +
-
-
    -
  • 1
    • -
  • 2. Peser le contenant et valider
    • -
  • 3
    • -
  • 4
    • -
  • 5
    • -
+
+
+
+
Poids Net
+
+ +
+
+ +
+
Prix
+
+ 0.00 € +
+
+ +
+
+
Poids Brut total:
+
+ 1 +
+
+ +
+
Tare contenant:
+
+ +
+
-
+