diff --git a/www/app/modules/ppo/ppohelper.php b/www/app/modules/ppo/ppohelper.php index 8b7e01368..a8e2d9edd 100644 --- 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 index 50deb3e06..0a0c2217f 100644 --- 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 index b0ad541bf..5dde66bae 100644 --- a/www/templates/pages/service/armpos.html +++ b/www/templates/pages/service/armpos.html @@ -186,20 +186,20 @@

        АРМ кассира

- +
- +
- +
- +
@@ -262,7 +262,7 @@

Ввод товара

-
diff --git a/www/templates_ua/pages/service/armpos.html b/www/templates_ua/pages/service/armpos.html index f416c4df7..9727b330d 100644 --- a/www/templates_ua/pages/service/armpos.html +++ b/www/templates_ua/pages/service/armpos.html @@ -184,15 +184,15 @@

        АРМ касира

- +
- +
- +
@@ -260,7 +260,7 @@

Введення товару

-