From a19bbc146b3904a2c0fc902e5e6a32b5feb84f72 Mon Sep 17 00:00:00 2001 From: Juliana Date: Thu, 16 Jul 2020 11:12:58 +0200 Subject: [PATCH] Ajout screen container --- models/__pycache__/__init__.cpython-35.pyc | Bin 240 -> 0 bytes models/__pycache__/pos_config.cpython-35.pyc | Bin 754 -> 0 bytes .../pos_transaction.cpython-35.pyc | Bin 1844 -> 0 bytes static/src/css/style.css | 16 +++- static/src/js/container.js | 2 + static/src/xml/pos.xml | 76 +++++++++++++----- 6 files changed, 74 insertions(+), 20 deletions(-) delete mode 100644 models/__pycache__/__init__.cpython-35.pyc delete mode 100644 models/__pycache__/pos_config.cpython-35.pyc delete mode 100644 models/__pycache__/pos_transaction.cpython-35.pyc diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 76538067756fbba9a2cb06705e643efa90d22264..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 240 zcmX|)!3x4K42IKff+(UVpTNs57Cnpj0OG~l4wl+gEo{wbH$i+NkG{^Xo_qyQrUMPh zpL`+wnT|$-;rxDh0>F#v9}!I(DnBF1DH#+1C4-Cs3mkPEK^76muuqdWqtleNg9^P+ zXiw%$G!9fdX}wgnLAy)i7F@7*G06j5FU&zcTYkY(bIcJtSuD9~e2pc)I;jw=Ul+mj m`*oZ zmSB-%JHAlnOw~)V+D;l}PD-EK*tA;ItL@V{m9#E-CdH-Znc@0Ilzf|hQY)41x#Hmb zMp zRr!skrBY4*CD=`0N^hQbzdm<(*X5JuRu55mgwv!L(jXoj2i@bD#Vodw^U`=r!Jk>X e`)P-t-97Sa9*XO-BgZH2x(2>?tBu?IGW-u%vc-1* diff --git a/models/__pycache__/pos_transaction.cpython-35.pyc b/models/__pycache__/pos_transaction.cpython-35.pyc deleted file mode 100644 index df3de380e8ebf5088bd5dce6ab37b617cd327087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1844 zcmZuyOK;pZ5FS1E{qQq!niR@$QNRl)hhB<4VAq8Y-nwy+00I($7P+=Ik|3<#1*=LyqQ~p|%Hu?tS^^`{NeC-_Uq$4x5R1K1`kwt#K|-BQ_9FS4zb zkAQ9~ks|ZBUV0342lM+x4o`UgT97m+VG;4P9A!M;EgFjL*W@f_9%Z@Lu*=KdD>nB| z1gFcWD91+>Exed`XCx+R$fWz*t9?YN-1_;a+1^X@YWrN;c~r880fMyLL9#M> z^VcU4&7+X0NLDUo`v3vtNQ}0>fVGq8*Xh72XG6pFcgn4EKFsFjFGPE1?{F5Z0%se z!l_J+%K^N-RefO1q#4n}i7Ty)XVN_r{3>VCxe^g3#0>?*Oo$;yC0&wbETt0%bIjto z>^H#7<)|SA2#M@96mr-QaP<=i1Ab0y_?<0;VNh}=Si@Po~pEtk$~lz19RPQjUA+GM)~Z^3f=wEPj+<< zbSZ?`;rdaSea7k#h3g+wst?|M3wH(-pddp)@CHDXM5_`J8HJm^AMh&p!-O5Q3oN*7 z!CSmDPAB$EcCg&$TqLBB#_NX-+lLOesVx|mdLPE4_>w2u@~>0FT~ zit8i!21o890druj8zt6#vmtl?Q|zrGo$OXfA>6)uDMIX7=`fP+z4Uu}3O+JyO7R>W{ZUvqSfJOW za~N|{_}wcOonI6|$_l@ei6~^69jw^8yV}Pjy?KH6v+PzXJX9#Gq@(LZe5LpnWvYO4 zot;L;bnbN8@WTW>9QoHs`lf5R=EzXLt?E}v=GF+oMT9!iR>iB&(kT$CI;5T56s1s& iEffIKIac2l?ec%;%Jz4wRDZ9$^EQ&FM&BG8W9wh&C(z3P 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:
+
+ +
+
-
+