Pārlūkot izejas kodu

Merge branch 'develop'

master
Guillaume Bourgeois pirms 1 gada
vecāks
revīzija
f162e8ae4c
2 mainītis faili ar 6 papildinājumiem un 1 dzēšanām
  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 Parādīt failu

@@ -782,6 +782,11 @@ Vue.component('order-form',{
} ;
},
template: '#order-form-template',
watch: {
'order.id_user': function () {
this.userChange();
}
},
methods: {
checkForm: function() {
this.errors = [] ;

+ 1
- 1
producer/web/js/vuejs/order-order.js Parādīt failu

@@ -593,7 +593,7 @@ var app = new Vue({
if(order != null) {
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) {
var count = 0 ;

Notiek ielāde…
Atcelt
Saglabāt