Browse Source

Merge branch 'develop'

master
Guillaume Bourgeois 1 year ago
parent
commit
f162e8ae4c
2 changed files with 6 additions and 1 deletions
  1. +5
    -0
      backend/web/js/vuejs/distribution-index.js
  2. +1
    -1
      producer/web/js/vuejs/order-order.js

+ 5
- 0
backend/web/js/vuejs/distribution-index.js View File

} ; } ;
}, },
template: '#order-form-template', template: '#order-form-template',
watch: {
'order.id_user': function () {
this.userChange();
}
},
methods: { methods: {
checkForm: function() { checkForm: function() {
this.errors = [] ; this.errors = [] ;

+ 1
- 1
producer/web/js/vuejs/order-order.js View File

if(order != null) { if(order != null) {
total = this.priceTotal() - order.amount_paid ; total = this.priceTotal() - order.amount_paid ;
} }
return this.producer.credit_limit == null || (this.producer.credit_limit != null && (this.user.credit - total >= this.producer.credit_limit)) ;
return this.producer.credit_limit == null || (this.producer.credit_limit != null && (this.user.credit - total >= this.producer.credit_limit)) ;
}, },
countProductsByCategory: function(category) { countProductsByCategory: function(category) {
var count = 0 ; var count = 0 ;

Loading…
Cancel
Save