fix

leon-mbs · Dec 29, 2020 · 58cc798 · 58cc798
1 parent 2e23adb
commit 58cc798
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/www/app/modules/ppo/ppohelper.php b/www/app/modules/ppo/ppohelper.php
@@ -290,7 +290,7 @@ public static function zform($posid, $stat, $rstat) {
             $amount = $amount + $stat['amount1'];
             $n++;
         }
-        if ($row['amount2'] > 0) {
+        if ($stat['amount2'] > 0) {
             $header['pays'][] = array(
                 'formname' => H::l('ppo_credit'),
                 'formcode' => 2,

diff --git a/www/app/pages/service/armpos.php b/www/app/pages/service/armpos.php
@@ -715,6 +715,9 @@ public function savedocOnClick($sender) {
             $logger->error($ee->getMessage() . " Документ " . $this->_doc->meta_desc);
             return;
         }
+        $this->form3->customer->setKey(0);   
+        $this->form3->customer->setText('');   
+        $this->form3->payment->setValue(H::getDefMF());   
         $this->form3->setVisible(false);
         $this->form4->setVisible(true);
 
@@ -725,17 +728,23 @@ public function savedocOnClick($sender) {
 
     public function OnPayment($sender) {
         $b = $sender->getValue();
+        $this->form3->payed->setVisible(true);
+        $this->form3->payamount->setVisible(true);
+        $this->form3->paydisc->setVisible(true);
+        $this->form3->exchange->setVisible(true);        
+
         if ($b == \App\Entity\MoneyFund::PREPAID) {
             $this->form3->payed->setVisible(false);
             $this->form3->payamount->setVisible(false);
             $this->form3->paydisc->setVisible(false);
             $this->form3->exchange->setVisible(false);
-        } else {
-            $this->form3->payed->setVisible(true);
-            $this->form3->payamount->setVisible(true);
-            $this->form3->paydisc->setVisible(true);
-            $this->form3->exchange->setVisible(true);
-        }
+        }  
+        if ($b == \App\Entity\MoneyFund::CREDIT) {
+            $this->form3->payed->setVisible(false);
+            //$this->form3->payamount->setVisible(false);
+            $this->form3->paydisc->setVisible(false);
+            $this->form3->exchange->setVisible(false);
+        }  
     }
 
 

diff --git a/www/templates/pages/service/armpos.html b/www/templates/pages/service/armpos.html
@@ -186,20 +186,20 @@ <h3> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;АРМ кассира</h3>
             </div>
             <div class="form-group">
                 <label for="paydisc" data-label="paydisc">Скидка</label>
-                <input class="form-control" type="text" zippy="paydisc">
+                <input autocomplete="off" class="form-control" type="text" zippy="paydisc">
             </div>
             <div class="form-group">
                 <label for="payamount" data-label="payamount">К оплате</label>
-                <input class="form-control" type="text" zippy="payamount">
+                <input autocomplete="off" class="form-control" type="text" zippy="payamount">
             </div>
             <div class="form-group">
                 <label for="payed" data-label="payed">Внесена оплата</label>
-                <input class="form-control" type="text" zippy="payed">
+                <input autocomplete="off" class="form-control" type="text" zippy="payed">
             </div>
 
             <div class="form-group">
                 <label for="exchange" data-label="exchange">Сдача</label>
-                <input class="form-control-plaintext" type="text" zippy="exchange" readonly>
+                <input   class="form-control-plaintext" type="text" zippy="exchange" readonly>
             </div>
 
         </div>
@@ -262,7 +262,7 @@ <h4>Ввод товара </h4>
 
             <div class="form-group">
                 <label for="editprice">Цена </label>
-                <input class="form-control" type="text" zippy="editprice" required="required" pattern="[0-9\.]+"
+                <input autocomplete="off" class="form-control" type="text" zippy="editprice" required="required" pattern="[0-9\.]+"
                        style="width: 70px;">
 
             </div>

diff --git a/www/templates_ua/pages/service/armpos.html b/www/templates_ua/pages/service/armpos.html
@@ -184,15 +184,15 @@ <h3> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;АРМ касира</h3>
             </div>
             <div class="form-group">
                 <label for="paydisc" data-label="paydisc">Знижка</label>
-                <input class="form-control" type="text" zippy="paydisc">
+                <input autocomplete="off" class="form-control" type="text" zippy="paydisc">
             </div>
             <div class="form-group">
                 <label for="payamount" data-label="payamount">До оплати</label>
-                <input class="form-control" type="text" zippy="payamount">
+                <input autocomplete="off" class="form-control" type="text" zippy="payamount">
             </div>
             <div class="form-group">
                 <label for="payed" data-label="payed">Внесена оплата</label>
-                <input class="form-control" type="text" zippy="payed">
+                <input autocomplete="off" class="form-control" type="text" zippy="payed">
             </div>
 
             <div class="form-group">
@@ -260,7 +260,7 @@ <h4>Введення товару </h4>
 
             <div class="form-group">
                 <label for="editprice">Ціна </label>
-                <input class="form-control" type="text" zippy="editprice" required="required" pattern="[0-9\.]+"
+                <input autocomplete="off" class="form-control" type="text" zippy="editprice" required="required" pattern="[0-9\.]+"
                        style="width: 70px;">
 
             </div>