Browse Source

Ajout screen container

12.0
Juliana 4 years ago
parent
commit
a19bbc146b
  1. BIN
      models/__pycache__/__init__.cpython-35.pyc
  2. BIN
      models/__pycache__/pos_config.cpython-35.pyc
  3. BIN
      models/__pycache__/pos_transaction.cpython-35.pyc
  4. 16
      static/src/css/style.css
  5. 2
      static/src/js/container.js
  6. 76
      static/src/xml/pos.xml

BIN
models/__pycache__/__init__.cpython-35.pyc

BIN
models/__pycache__/pos_config.cpython-35.pyc

BIN
models/__pycache__/pos_transaction.cpython-35.pyc

16
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;

2
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(){

76
static/src/xml/pos.xml

@ -50,27 +50,67 @@
</t>
<t t-name="BalanceContainerScaleScreenWidget">
<div class="scale-screen screen">
<div class="pos-topheader oe_hidden" id="pos-topheader-scale">
<div class="pos-header-custo">
<div class="top-content">
<span class='button back'>
<i class='fa fa-angle-double-left'></i>
Retour
</span>
<div class="pos-topheader oe_hidden" id="pos-topheader-scale-cont">
<div class="pos-header-custo">
<div class="top-content">
<span class='button back'>
<i class='fa fa-angle-double-left'></i>
Retour
</span>
</div>
<div class="pos-text">
<ul>
<li><span>1</span></li>
<li class="li-active"><span>2. Peser le contenant et valider</span></li>
<li><span>3</span></li>
<li><span>4</span></li>
<li><span>5</span></li>
</ul>
</div>
</div>
</div>
<div class="balancecontainerscale-screen screen">
<div class="pos-bottom">
<div class="pos-confirm" id="validation-bloc-cont">
<h1 class='product-name'>Ajouter un contenant</h1>
<div class='add-container'>
Sauvegarder
<i class='fa fa-angle-double-right'></i>
</div>
<div id="pos-header-text-peser" class="pos-text oe_hidden">
<ul>
<li><span>1</span></li>
<li class="li-active"><span>2. Peser le contenant et valider</span></li>
<li><span>3</span></li>
<li><span>4</span></li>
<li><span>5</span></li>
</ul>
</div>
<div class="centered-content-flex">
<div class="flex-poids">
<div class="label-scale div-net margin-top">Poids Net</div>
<div class='weight js-weight'>
<t t-esc="widget.get_product_weight_string()" />
</div>
</div>
<div class="flex-poids">
<div class="label-scale div-net margin-top">Prix</div>
<div class='computed-price'>
0.00 €
</div>
</div>
<div class="flex-poids">
<div>
<div class="label-scale">Poids Brut total:</div>
<div class='weight-brut'>
1
</div>
</div>
<div>
<div class="label-scale-cont ">Tare contenant: </div>
<div class="label-scale-cont">
<!-- <t t-esc="widget.get_current_container_weight()"/> -->
</div>
</div>
</div>
</div>
</div>
<div class="screen-content">
<!-- <div class="screen-content">
<div class="top-content">
<span class='button back'>
<i class='fa fa-angle-double-left'></i>
@ -87,7 +127,7 @@
<i class='fa fa-angle-double-right'></i>
</div>
</div>
</div>
</div> -->
</div>
</t>

Loading…
Cancel
Save