hotfix

leon-mbs · Jul 8, 2024 · 2f4c8c4 · 2f4c8c4
1 parent 7989d46
commit 2f4c8c4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/www/app/helper.php b/www/app/helper.php
@@ -1084,6 +1084,7 @@ public static function printItems(array $items, $pqty=0,array $tags=[]) {
             $header['garterm'] = $item->warranty;
             $header['country'] = $item->country;
             $header['brand']   = $item->manufacturer;
+            $header['notes']   = $item->notes;
 
 
             if (strlen($item->url) > 0 && $printer['pqrcode'] == 1) {
@@ -1206,6 +1207,7 @@ public static function printItemsEP(array $items, $pqty=0,array $tags=[]) {
             $header['garterm'] = $item->warranty;
             $header['country'] = $item->country;
             $header['brand']   = $item->manufacturer;
+            $header['notes']   = $item->notes;
 
             $header['price'] = self::fa($item->getPrice($printer['pricetype']));
             if(intval($item->price) > 0) {

diff --git a/www/app/pages/service/armfood.php b/www/app/pages/service/armfood.php
@@ -1391,6 +1391,7 @@ public function createdoc() {
         $this->_doc->headerdata['forbar'] =  $this->docpanel->listsform->forbar->isChecked() ? 1 : 0;
         $this->_doc->headerdata['arm'] = 1;
         $this->_doc->document_date = time();
+        $this->_doc->headerdata['time'] = time();
 
         $this->_doc->headerdata['contact'] = $this->docpanel->listsform->contact->getText();
         $this->_doc->notes = $this->docpanel->listsform->notes->getText();

diff --git a/www/app/pages/service/armpos.php b/www/app/pages/service/armpos.php
@@ -366,6 +366,8 @@ public function newdoc($sender) {
         $this->docpanel->form3->document_date->setDate(time());
         $this->_doc = \App\Entity\Doc\Document::create('POSCheck');
         $this->_doc->headerdata['arm'] = 1;
+        $this->_doc->headerdata['time'] = time();
+
         $this->docpanel->form3->document_number->setText($this->_doc->nextNumber());
 
 

diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html
@@ -499,6 +499,7 @@ <h4>Параметри для етикеток і цінників</h4>
                               <tr><td><b>country</b></td><td>Країна-виробник</td></tr>
                               <tr><td><b>garterm</b></td><td>Гарантiйний термін</td></tr>
                               <tr><td><b>brand</b></td><td>Бренд</td></tr>
+                              <tr><td><b>notes</b></td><td>Примітка</td></tr>
 
                               <tr><td colspan="2" align="center">Управляючi теги</td></tr>
                               <tr><td><b>isprice</b></td><td>Друкувати цiну</td></tr>