From decd5c300baafd55d3367ec34e6e7ec606870da4 Mon Sep 17 00:00:00 2001 From: Leon Date: Fri, 7 Jun 2019 17:56:24 +0300 Subject: [PATCH 01/17] =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B4=D0=BB=D1=8F=20=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update.sql | 1 + www/app/entity/doc/goodsreceipt.php | 2 +- www/app/entity/doc/moveitem.php | 2 +- www/app/entity/doc/prodreceipt.php | 2 +- www/app/entity/doc/transitem.php | 2 +- www/app/entity/stock.php | 27 +++++++++++++++------------ www/app/pages/base.php | 1 + www/app/pages/doc/retcustissue.php | 2 +- www/app/pages/options.php | 3 +++ www/templates/pages/options.html | 4 ++++ 10 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 db/update.sql diff --git a/db/update.sql b/db/update.sql new file mode 100644 index 000000000..558b6f936 --- /dev/null +++ b/db/update.sql @@ -0,0 +1 @@ +ALTER TABLE `store_stock` ADD `snumber` VARCHAR(64) NULL AFTER `qty`, ADD `sdate` DATE NULL AFTER `snumber`; \ No newline at end of file diff --git a/www/app/entity/doc/goodsreceipt.php b/www/app/entity/doc/goodsreceipt.php index 1b5ae52ce..decf662cd 100644 --- a/www/app/entity/doc/goodsreceipt.php +++ b/www/app/entity/doc/goodsreceipt.php @@ -49,7 +49,7 @@ public function Execute() { //аналитика foreach ($this->detaildata as $row) { - $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'], true); + $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'], true); $sc = new Entry($this->document_id, $row['amount'], $row['quantity']); diff --git a/www/app/entity/doc/moveitem.php b/www/app/entity/doc/moveitem.php index 016d0b4d0..6bcab7ca1 100644 --- a/www/app/entity/doc/moveitem.php +++ b/www/app/entity/doc/moveitem.php @@ -31,7 +31,7 @@ public function Execute() { $sc->save(); - $stockto = Stock::getStock($this->headerdata['storeto'], $value['item_id'], $value['partion'], true); + $stockto = Stock::getStock($this->headerdata['storeto'], $value['item_id'], $value['partion'],$value['snumber'],, true); $sc = new Entry($this->document_id, $value['quantity'] * $value['partion'], $value['quantity']); $sc->setStock($stockto->stock_id); diff --git a/www/app/entity/doc/prodreceipt.php b/www/app/entity/doc/prodreceipt.php index b57248a1b..65e3fc958 100644 --- a/www/app/entity/doc/prodreceipt.php +++ b/www/app/entity/doc/prodreceipt.php @@ -50,7 +50,7 @@ public function Execute() { //аналитика foreach ($this->detaildata as $row) { - $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'], true); + $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'], true); $sc = new Entry($this->document_id, $row['amount'], $row['quantity']); diff --git a/www/app/entity/doc/transitem.php b/www/app/entity/doc/transitem.php index f04c94e14..29d567b54 100644 --- a/www/app/entity/doc/transitem.php +++ b/www/app/entity/doc/transitem.php @@ -32,7 +32,7 @@ public function Execute() { $ti = Item::load($this->headerdata['toitem']); $price = round(($this->amount ) / $this->headerdata["toquantity"]); - $stockto = Stock::getStock($this->headerdata['storefrom'], $ti->item_id, $price, true); + $stockto = Stock::getStock($this->headerdata['storefrom'], $ti->item_id, $price,"", true); $sc = new Entry($this->document_id, $this->headerdata["toquantity"] * $price, $this->headerdata["toquantity"]); $sc->setStock($stockto->stock_id); diff --git a/www/app/entity/stock.php b/www/app/entity/stock.php index b4198c7f9..e3c73a33c 100644 --- a/www/app/entity/stock.php +++ b/www/app/entity/stock.php @@ -13,7 +13,7 @@ class Stock extends \ZCL\DB\Entity { protected function init() { $this->stock_id = 0; - $this->deleted = 0; + } /** @@ -26,15 +26,13 @@ protected function init() { public static function findArrayAC($store, $partname = "") { - $criteria = "qty <>0 and disabled <> 1 "; + $criteria = "qty <> 0 and disabled <> 1 "; if (strlen($partname) > 0) { $partname = self::qstr('%' . $partname . '%'); - $criteria .= " and (itemname like {$partname} or item_code like {$partname} )"; + $criteria .= " and (itemname like {$partname} or item_code like {$partname} or snumber like {$partname} )"; } - - - - $entitylist = self::find($criteria, "itemname"); + + $entitylist = self::find($criteria, "sdate asc"); $list = array(); foreach ($entitylist as $key => $value) { @@ -52,11 +50,15 @@ public static function findArrayAC($store, $partname = "") { * @param mixed $price Цена * @param mixed $create Создать если не существует */ - public static function getStock($store_id, $item_id, $price, $create = false) { - - $where = "store_id = {$store_id} and item_id = {$item_id} and partion = {$price} "; - + public static function getStock($store_id, $item_id, $price,$snumber="", $create = false) { $conn = \ZDB\DB::getConnect(); + + $where = "store_id = {$store_id} and item_id = {$item_id} and partion = {$price} "; + + if (strlen($snumber) > 0) { + $snumber = self::qstr('%' . $snumber . '%'); + $where .= " and snumber = {$snumber} "; + } //на случай если удален //$conn->Execute("update store_stock set deleted=0 where " . $where); @@ -67,6 +69,7 @@ public static function getStock($store_id, $item_id, $price, $create = false) { $stock->store_id = $store_id; $stock->item_id = $item_id; $stock->partion = $price; + $stock->snumber = $snumber; $stock->save(); } @@ -101,7 +104,7 @@ public static function getQuantity($stock_id, $date = null) { public static function pickup($store_id, $item_id, $qty) { $res = array(); $where = "store_id = {$store_id} and item_id = {$item_id} and qty >0 "; - $stlist = self::find($where, 'stock_id'); + $stlist = self::find($where, 'sdate,stock_id'); foreach ($stlist as $st) { if ($st->qty >= $qty) { $st->quantity = $qty; diff --git a/www/app/pages/base.php b/www/app/pages/base.php index 1cfccb011..e58bfa347 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -54,6 +54,7 @@ public function __construct($params = null) { $options = System::getOptions('common'); $this->_tvars["useset"] = $options['useset'] == 1; + $this->_tvars["usesnumber"] = $options['usesnumber'] == 1; $this->_tvars["smart"] = Helper::generateSmartMenu(); $this->_tvars["picontent"] = $pi; diff --git a/www/app/pages/doc/retcustissue.php b/www/app/pages/doc/retcustissue.php index cca772407..5460bf604 100644 --- a/www/app/pages/doc/retcustissue.php +++ b/www/app/pages/doc/retcustissue.php @@ -110,7 +110,7 @@ public function __construct($docid = 0, $basedocid = 0) { foreach ($basedoc->detaildata as $item) { - $stock = \App\Entity\Stock::getStock($basedoc->headerdata['store'], $item['item_id'], $item['price']); + $stock = \App\Entity\Stock::getStock($basedoc->headerdata['store'], $item['item_id'], $item['price'], $item['snumber']); $stock->quantity = $item['quantity']; $stock->price = $item['price']; $this->_tovarlist[$stock->stock_id] = $stock; diff --git a/www/app/pages/options.php b/www/app/pages/options.php index b2258a0fa..f93a00436 100644 --- a/www/app/pages/options.php +++ b/www/app/pages/options.php @@ -36,6 +36,7 @@ public function __construct() { + $this->common->add(new CheckBox('usesnumber')); $this->common->add(new CheckBox('useset')); $this->common->add(new CheckBox('useval'))->onChange($this, "onVal"); $this->common->add(new TextInput('cdoll')); @@ -67,6 +68,7 @@ public function __construct() { $this->common->price4->setText($common['price4']); $this->common->price5->setText($common['price5']); $this->common->useset->setChecked($common['useset']); + $this->common->usesnumber->setChecked($common['usesnumber']); $this->common->useval->setChecked($common['useval']); // $this->common->closeddate->setDate($common['closeddate']); @@ -129,6 +131,7 @@ public function saveCommonOnClick($sender) { $common['price4'] = $this->common->price4->getText(); $common['price5'] = $this->common->price5->getText(); $common['useset'] = $this->common->useset->isChecked(); + $common['usesnumber'] = $this->common->usesnumber->isChecked(); $common['useval'] = $this->common->useval->isChecked(); // $common['closeddate'] = $this->common->closeddate->getDate(); diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html index 467c13758..7805d2ebf 100644 --- a/www/templates/pages/options.html +++ b/www/templates/pages/options.html @@ -42,6 +42,10 @@

Основные настройки

+
+ + +
From 482412872eafcf20aa04096db70c1cf3f38b2c46 Mon Sep 17 00:00:00 2001 From: Leon Date: Fri, 7 Jun 2019 22:57:43 +0300 Subject: [PATCH 02/17] =?UTF-8?q?=D0=B4=D0=B5=D1=82=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=BE=20=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BE=D1=80=D1=83=D0=B4=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/pages/reference/eqlist.php | 47 ++++++++++++++++++++++- www/app/pages/register/tasklist.php | 7 +++- www/templates/pages/reference/eqlist.html | 33 ++++++++++++++-- 3 files changed, 80 insertions(+), 7 deletions(-) diff --git a/www/app/pages/reference/eqlist.php b/www/app/pages/reference/eqlist.php index c5834b73e..637f82202 100644 --- a/www/app/pages/reference/eqlist.php +++ b/www/app/pages/reference/eqlist.php @@ -25,6 +25,7 @@ class EqList extends \App\Pages\Base { private $_item; + public $_uselist=array(); public function __construct() { parent::__construct(); @@ -35,9 +36,11 @@ public function __construct() { $this->filter->add(new TextInput('searchkey')); $this->filter->add(new DropDownChoice('searchemp', Employee::findArray("emp_name", "", "emp_name"), 0)); + $this->add(new Panel('itemtable'))->setVisible(true); $this->itemtable->add(new DataView('eqlist', new EQDS($this), $this, 'eqlistOnRow')); $this->itemtable->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); + $this->itemtable->eqlist->setPageSize(25); $this->itemtable->add(new \Zippy\Html\DataList\Paginator('pag', $this->itemtable->eqlist)); $this->itemtable->eqlist->setSelectedClass('table-success'); @@ -55,18 +58,27 @@ public function __construct() { $this->itemdetail->add(new SubmitButton('save'))->onClick($this, 'OnSubmit'); $this->itemdetail->add(new Button('cancel'))->onClick($this, 'cancelOnClick'); + + $this->add(new Panel('usetable'))->setVisible(false); + $this->usetable->add(new Label('usename')); + $this->usetable->add(new ClickLink('back'))->onClick($this, 'cancelOnClick'); + $this->usetable->add(new DataView('uselist', new ArrayDataSource($this,'_uselist'), $this, 'uselistOnRow')); + } + + public function eqlistOnRow($row) { $item = $row->getDataItem(); $row->add(new Label('eq_name', $item->eq_name)); $row->add(new Label('code', $item->code)); $row->add(new Label('serial', $item->serial)); + $row->add(new ClickLink('use'))->onClick($this, 'useOnClick'); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); } - + public function deleteOnClick($sender) { if (false == \App\ACL::checkEditRef('EqList')) return; @@ -85,6 +97,38 @@ public function deleteOnClick($sender) { $this->itemtable->eqlist->Reload(); } + public function useOnClick($sender) { + $this->itemtable->setVisible(false); + $this->usetable->setVisible(true); + $item=$sender->getOwner()->getDataItem(); + $this->usetable->usename->setText($item->eq_name); + $this->_uselist = array(); + + $list = \App\Entity\Doc\Document::find("meta_name='task' and state not in(2,3,1,9) ","document_date desc") ; + + + foreach($list as $task){ + foreach ($task->detaildata as $value) { + if ($value['eq_id'] > 0) { + + $it = new \App\DataItem(array( + "usetask" => $task->document_number, + "useplace" => $value['eq_name'] + )); + $this->_uselist[] = $it; + + } + } + } + + $this->usetable->uselist->Reload(); + } + public function uselistOnRow($row) { + $item = $row->getDataItem(); + $row->add(new Label('usetask', $item->usetask)); + $row->add(new Label('useplace', $item->useplace)); + + } public function editOnClick($sender) { $this->_item = $sender->owner->getDataItem(); $this->itemtable->setVisible(false); @@ -110,6 +154,7 @@ public function addOnClick($sender) { public function cancelOnClick($sender) { $this->itemtable->setVisible(true); $this->itemdetail->setVisible(false); + $this->usetable->setVisible(false); } public function OnFilter($sender) { diff --git a/www/app/pages/register/tasklist.php b/www/app/pages/register/tasklist.php index 26c791da3..051a7a780 100644 --- a/www/app/pages/register/tasklist.php +++ b/www/app/pages/register/tasklist.php @@ -141,14 +141,17 @@ public function tasklistOnRow($row) { $row->add(new Label('taskemps', implode(', ', $emps))); $row->add(new Label('taskclient', $task->customer_name)); $row->add(new Label('taskamount', $task->amount)); - $row->add(new Label('taskdebet', $task->amount - $task->datatag)); + $row->add(new Label('taskdebet', $task->amount - $task->datatag)); $this->_tamount = $this->_tamount + $task->amount; - $this->_tdebet = $this->_tdebet + $task->amount - $task->datatag; + $this->_tdebet = $this->_tdebet + $task->amount - $task->datatag; $row->add(new ClickLink('taskshow'))->onClick($this, 'taskshowOnClick'); $row->add(new ClickLink('taskedit'))->onClick($this, 'taskeditOnClick'); $row->add(new ClickLink('taskpay'))->onClick($this, 'taskpayOnClick'); + if ($task->state == Document::STATE_CLOSED){ + $row->taskedit->setVisible(false); + } } //панель кнопок diff --git a/www/templates/pages/reference/eqlist.html b/www/templates/pages/reference/eqlist.html index 1eb03feb3..a2bf685b4 100644 --- a/www/templates/pages/reference/eqlist.html +++ b/www/templates/pages/reference/eqlist.html @@ -41,10 +41,11 @@

Справочник оборудования

- - - - + + +   +   +
@@ -100,6 +101,30 @@

Редактирование

+
+ + + К списку +

+ + + + + + + + + + + + + + + + +
НарядУчасток
+ +
From 0d0608907a669a558ba2b827bdc59619eddc3df1 Mon Sep 17 00:00:00 2001 From: Leon Date: Sat, 8 Jun 2019 19:57:41 +0300 Subject: [PATCH 03/17] =?UTF-8?q?=D1=81=D1=80=D0=BE=D0=BA=20=D0=B3=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/item.php | 2 ++ www/app/pages/reference/itemlist.php | 5 ++++- www/templates/pages/reference/itemlist.html | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/www/app/entity/item.php b/www/app/entity/item.php index ad4c20554..9ca0ce445 100644 --- a/www/app/entity/item.php +++ b/www/app/entity/item.php @@ -33,6 +33,7 @@ protected function afterLoad() { $this->curname = (string) ($xml->curname[0]); $this->currate = doubleval($xml->currate[0]); $this->pricelist = (int) $xml->pricelist[0]; + $this->term = (int) $xml->term[0]; @@ -45,6 +46,7 @@ protected function beforeSave() { $this->detail = ""; //упаковываем данные в detail $this->detail .= "{$this->pricelist}"; + $this->detail .= "{$this->term}"; $this->detail .= "{$this->price1}"; $this->detail .= "{$this->price2}"; diff --git a/www/app/pages/reference/itemlist.php b/www/app/pages/reference/itemlist.php index 624a5938d..bda7b3f5e 100644 --- a/www/app/pages/reference/itemlist.php +++ b/www/app/pages/reference/itemlist.php @@ -83,6 +83,7 @@ public function __construct($add = false) { } $this->itemdetail->add(new TextInput('editbarcode')); $this->itemdetail->add(new TextInput('editminqty')); + $this->itemdetail->add(new TextInput('editterm')); $this->itemdetail->add(new TextInput('editmsr')); $this->itemdetail->add(new DropDownChoice('editcat', Category::findArray("cat_name", "", "cat_name"), 0)); $this->itemdetail->add(new TextInput('editcode')); @@ -174,6 +175,7 @@ public function editOnClick($sender) { $this->itemdetail->editcode->setText($this->_item->item_code); $this->itemdetail->editbarcode->setText($this->_item->bar_code); $this->itemdetail->editmsr->setText($this->_item->msr); + $this->itemdetail->editterm->setText( $this->_item->term); $this->itemdetail->editminqty->setText( \App\Helper::fqty($this->_item->minqty)); $this->itemdetail->editdisabled->setChecked($this->_item->disabled); $this->itemdetail->editpricelist->setChecked($this->_item->pricelist); @@ -215,10 +217,11 @@ public function OnSubmit($sender) { $this->_item->bar_code = trim($this->itemdetail->editbarcode->getText()); $this->_item->msr = $this->itemdetail->editmsr->getText(); + $this->_item->term = $this->itemdetail->editterm->getText(); $this->_item->minqty = $this->itemdetail->editminqty->getText(); $this->_item->description = $this->itemdetail->editdescription->getText(); $this->_item->disabled = $this->itemdetail->editdisabled->isChecked() ? 1 : 0; - ; + $this->_item->pricelist = $this->itemdetail->editpricelist->isChecked() ? 1 : 0; //проверка уникальности артикула diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html index c75930485..6925bec37 100644 --- a/www/templates/pages/reference/itemlist.html +++ b/www/templates/pages/reference/itemlist.html @@ -121,6 +121,12 @@

Редактирование товара

+
+ +
+ +
+
From e85ad9e8e6c6966456c4ac6b7af360c498743d64 Mon Sep 17 00:00:00 2001 From: Leon Date: Sat, 8 Jun 2019 23:04:25 +0300 Subject: [PATCH 04/17] =?UTF-8?q?=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE?= =?UTF-8?q?=D0=B3=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=20=20=D0=B2=20=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/application.php | 14 +++---- www/app/helper.php | 8 +--- www/app/{ => modules}/shop/basket.php | 2 +- www/app/{ => modules}/shop/comparelist.php | 2 +- .../shop/entity/manufacturer.php | 2 +- www/app/{ => modules}/shop/entity/order.php | 2 +- .../{ => modules}/shop/entity/orderdetail.php | 2 +- www/app/{ => modules}/shop/entity/product.php | 4 +- .../shop/entity/productattribute.php | 2 +- .../shop/entity/productcomment.php | 2 +- .../shop/entity/productgroup.php | 2 +- www/app/{ => modules}/shop/helper.php | 8 ++-- www/app/{ => modules}/shop/pages/aboutus.php | 2 +- www/app/{ => modules}/shop/pages/base.php | 10 ++--- www/app/{ => modules}/shop/pages/catalog.php | 18 ++++----- www/app/{ => modules}/shop/pages/compare.php | 8 ++-- www/app/{ => modules}/shop/pages/contact.php | 2 +- www/app/{ => modules}/shop/pages/delivery.php | 2 +- .../{ => modules}/shop/pages/grouplist.php | 10 ++--- www/app/{ => modules}/shop/pages/main.php | 10 ++--- .../shop/pages/manufacturers.php | 8 ++-- www/app/{ => modules}/shop/pages/options.php | 4 +- www/app/{ => modules}/shop/pages/order.php | 12 +++--- .../{ => modules}/shop/pages/productlist.php | 18 ++++----- .../{ => modules}/shop/pages/productview.php | 18 ++++----- www/app/pages/base.php | 2 + www/app/pages/options.php | 6 +-- www/index.php | 4 +- .../{ => modules}/shop/pages/aboutus.html | 0 .../{ => modules}/shop/pages/base.html | 0 .../{ => modules}/shop/pages/catalog.html | 0 .../{ => modules}/shop/pages/compare.html | 0 .../{ => modules}/shop/pages/contact.html | 0 .../{ => modules}/shop/pages/delivery.html | 0 .../{ => modules}/shop/pages/grouplist.html | 0 .../{ => modules}/shop/pages/main.html | 0 .../shop/pages/manufacturers.html | 0 .../{ => modules}/shop/pages/options.html | 0 .../{ => modules}/shop/pages/order.html | 0 .../{ => modules}/shop/pages/productlist.html | 0 .../{ => modules}/shop/pages/productview.html | 0 www/templates/pages/base.html | 40 ++++++++++--------- www/templates/pages/options.html | 8 +--- www/templates/pages/users.html | 14 ++++--- 44 files changed, 122 insertions(+), 124 deletions(-) rename www/app/{ => modules}/shop/basket.php (97%) rename www/app/{ => modules}/shop/comparelist.php (98%) rename www/app/{ => modules}/shop/entity/manufacturer.php (94%) rename www/app/{ => modules}/shop/entity/order.php (98%) rename www/app/{ => modules}/shop/entity/orderdetail.php (90%) rename www/app/{ => modules}/shop/entity/product.php (97%) rename www/app/{ => modules}/shop/entity/productattribute.php (95%) rename www/app/{ => modules}/shop/entity/productcomment.php (93%) rename www/app/{ => modules}/shop/entity/productgroup.php (95%) rename www/app/{ => modules}/shop/helper.php (98%) rename www/app/{ => modules}/shop/pages/aboutus.php (87%) rename www/app/{ => modules}/shop/pages/base.php (86%) rename www/app/{ => modules}/shop/pages/catalog.php (94%) rename www/app/{ => modules}/shop/pages/compare.php (94%) rename www/app/{ => modules}/shop/pages/contact.php (97%) rename www/app/{ => modules}/shop/pages/delivery.php (87%) rename www/app/{ => modules}/shop/pages/grouplist.php (98%) rename www/app/{ => modules}/shop/pages/main.php (86%) rename www/app/{ => modules}/shop/pages/manufacturers.php (95%) rename www/app/{ => modules}/shop/pages/options.php (98%) rename www/app/{ => modules}/shop/pages/order.php (95%) rename www/app/{ => modules}/shop/pages/productlist.php (96%) rename www/app/{ => modules}/shop/pages/productview.php (94%) rename www/templates/{ => modules}/shop/pages/aboutus.html (100%) rename www/templates/{ => modules}/shop/pages/base.html (100%) rename www/templates/{ => modules}/shop/pages/catalog.html (100%) rename www/templates/{ => modules}/shop/pages/compare.html (100%) rename www/templates/{ => modules}/shop/pages/contact.html (100%) rename www/templates/{ => modules}/shop/pages/delivery.html (100%) rename www/templates/{ => modules}/shop/pages/grouplist.html (100%) rename www/templates/{ => modules}/shop/pages/main.html (100%) rename www/templates/{ => modules}/shop/pages/manufacturers.html (100%) rename www/templates/{ => modules}/shop/pages/options.html (100%) rename www/templates/{ => modules}/shop/pages/order.html (100%) rename www/templates/{ => modules}/shop/pages/productlist.html (100%) rename www/templates/{ => modules}/shop/pages/productview.html (100%) diff --git a/www/app/application.php b/www/app/application.php index 2bd48faf4..96f88b1f9 100644 --- a/www/app/application.php +++ b/www/app/application.php @@ -101,15 +101,15 @@ public function Route($uri) { $arr = explode('/', $uri); $pages = array( - "shop" => "\\App\\Shop\\Pages\\Main", + "shop" => "\\App\\Modules\\Shop\\Pages\\Main", "store" => "\\App\\Pages\\Main", - "sp" => "\\App\\Shop\\Pages\\ProductView", - "aboutus" => "\\App\\Shop\\Pages\\AboutUs", - "delivery" => "\\App\\Shop\\Pages\\Delivery", - "contact" => "\\App\\Shop\\Pages\\Contact", + "sp" => "\\App\\Modules\\Shop\\Pages\\ProductView", + "aboutus" => "\\App\\Modules\\Shop\\Pages\\AboutUs", + "delivery" => "\\App\\Modules\\Shop\\Pages\\Delivery", + "contact" => "\\App\\Modules\\Shop\\Pages\\Contact", "simage" => "\\App\\Pages\\LoadImage", - "scat" => "\\App\\Shop\\Pages\\Main", - "pcat" => "\\App\\Shop\\Pages\\Catalog" + "scat" => "\\App\\Modules\\Shop\\Pages\\Main", + "pcat" => "\\App\\Modules\\Shop\\Pages\\Catalog" ); if (strlen($pages[$arr[0]]) > 0) { diff --git a/www/app/helper.php b/www/app/helper.php index d0d0b9645..b561c37fb 100644 --- a/www/app/helper.php +++ b/www/app/helper.php @@ -90,9 +90,7 @@ public static function generateMenu($meta_type) { case 4 : $dir = "Pages/Reference"; break; - case 5 : - $dir = "Shop/Pages"; - break; + } $textmenu = ""; @@ -145,9 +143,7 @@ public static function generateSmartMenu() { case 4 : $dir = "Pages/Reference"; break; - case 5 : - $dir = "Shop/Pages"; - break; + } $textmenu .= " {$item['description']} "; diff --git a/www/app/shop/basket.php b/www/app/modules/shop/basket.php similarity index 97% rename from www/app/shop/basket.php rename to www/app/modules/shop/basket.php index 11826877c..33ef1d48a 100644 --- a/www/app/shop/basket.php +++ b/www/app/modules/shop/basket.php @@ -1,6 +1,6 @@ group_id); - $attrlist = \App\Shop\Helper::getProductAttributeListByGroup($this->group_id); + $attrlist = \App\Modules\Shop\Helper::getProductAttributeListByGroup($this->group_id); $ret = array(); $attrvalues = array(); diff --git a/www/app/shop/entity/productattribute.php b/www/app/modules/shop/entity/productattribute.php similarity index 95% rename from www/app/shop/entity/productattribute.php rename to www/app/modules/shop/entity/productattribute.php index d95e81125..a626da3e8 100644 --- a/www/app/shop/entity/productattribute.php +++ b/www/app/modules/shop/entity/productattribute.php @@ -1,6 +1,6 @@ _tvars["islogined"] = $user->user_id > 0; - $this->add(new \Zippy\Html\Link\BookmarkableLink('shopcart', "/index.php?p=/App/Shop/Pages/Order"))->setVisible(false); - $this->add(new \Zippy\Html\Link\BookmarkableLink('showcompare', "/index.php?p=/App/Shop/Pages/Compare"))->setVisible(false); + $this->add(new \Zippy\Html\Link\BookmarkableLink('shopcart', "/index.php?p=/App/Modules/Shop/Pages/Order"))->setVisible(false); + $this->add(new \Zippy\Html\Link\BookmarkableLink('showcompare', "/index.php?p=/App/Modules/Shop/Pages/Compare"))->setVisible(false); $this->op = System::getOptions("shop"); @@ -51,8 +51,8 @@ final protected function isError() { } protected function beforeRender() { - $this->shopcart->setVisible(\App\Shop\Basket::getBasket()->isEmpty() == false); - $this->showcompare->setVisible(\App\Shop\CompareList::getCompareList()->isEmpty() == false); + $this->shopcart->setVisible(\App\Modules\Shop\Basket::getBasket()->isEmpty() == false); + $this->showcompare->setVisible(\App\Modules\Shop\CompareList::getCompareList()->isEmpty() == false); } protected function afterRender() { diff --git a/www/app/shop/pages/catalog.php b/www/app/modules/shop/pages/catalog.php similarity index 94% rename from www/app/shop/pages/catalog.php rename to www/app/modules/shop/pages/catalog.php index ebef37024..674d6a578 100644 --- a/www/app/shop/pages/catalog.php +++ b/www/app/modules/shop/pages/catalog.php @@ -1,6 +1,6 @@ sfilter->add(new ClickLink('sclear'))->onClick($this, 'onSClear'); $this->sfilter->add(new ManufacturerList('mlist')); - foreach (\App\Shop\Entity\Manufacturer::find("manufacturer_id in(select manufacturer_id from shop_products where deleted <> 1 and group_id={$this->group_id})", "manufacturername") as $key => $value) { + foreach (\App\Modules\Shop\Entity\Manufacturer::find("manufacturer_id in(select manufacturer_id from shop_products where deleted <> 1 and group_id={$this->group_id})", "manufacturername") as $key => $value) { $this->sfilter->mlist->AddCheckBox($key, false, $value->manufacturername); } $this->sfilter->add(new DataView('attrlist', new ArrayDataSource(Helper::getProductSearchAttributeListByGroup($this->group_id)), $this, 'attrlistOnRow'))->Reload(); @@ -80,7 +80,7 @@ public function __construct($id) { } } $this->add(new Panel("recentlyp"))->setVisible(count($ra) > 0); - $this->recentlyp->add(new DataView('rlist', new EntityDataSource("\\App\\Shop\\Entity\\Product", " product_id in (" . implode(",", $ra) . ")"), $this, 'rOnRow')); + $this->recentlyp->add(new DataView('rlist', new EntityDataSource("\\App\\Modules\\Shop\\Entity\\Product", " product_id in (" . implode(",", $ra) . ")"), $this, 'rOnRow')); if (count($ra) > 0) { $this->recentlyp->rlist->Reload(); } @@ -110,12 +110,12 @@ public function plistOnRow($row) { public function oncartdel($sender) { $item = $sender->getOwner()->getDataItem(); - \App\Shop\Basket::getBasket()->deleteProduct($item->product_id); + \App\Modules\Shop\Basket::getBasket()->deleteProduct($item->product_id); } public function oncompdel($sender) { $item = $sender->getOwner()->getDataItem(); - \App\Shop\CompareList::getCompareList()->deleteProduct($item->product_id); + \App\Modules\Shop\CompareList::getCompareList()->deleteProduct($item->product_id); } public function rOnRow($row) { @@ -138,7 +138,7 @@ public function OnBuy($sender) { $product = $sender->getOwner()->getDataItem(); $product->quantity = 1; - \App\Shop\Basket::getBasket()->addProduct($product); + \App\Modules\Shop\Basket::getBasket()->addProduct($product); $this->setSuccess("Товар добавлен в корзину"); $this->resetURL(); diff --git a/www/app/shop/pages/compare.php b/www/app/modules/shop/pages/compare.php similarity index 94% rename from www/app/shop/pages/compare.php rename to www/app/modules/shop/pages/compare.php index 3b2059476..e56b0275b 100644 --- a/www/app/shop/pages/compare.php +++ b/www/app/modules/shop/pages/compare.php @@ -1,9 +1,9 @@ deleteProduct($params[0]); if ($comparelist->isEmpty()) { $filter = \App\Filter::getFilter("ProductCatalog"); - App::Redirect("\\App\\Shop\\Pages\\Catalog", $filter->group_id); + App::Redirect("\\App\\Modules\\Shop\\Pages\\Catalog", $filter->group_id); } } diff --git a/www/app/shop/pages/contact.php b/www/app/modules/shop/pages/contact.php similarity index 97% rename from www/app/shop/pages/contact.php rename to www/app/modules/shop/pages/contact.php index c61be87f3..fae380e5b 100644 --- a/www/app/shop/pages/contact.php +++ b/www/app/modules/shop/pages/contact.php @@ -1,6 +1,6 @@ add(new Panel("subcatlistp")); $this->subcatlistp->setVisible($id > 0); - $this->subcatlistp->add(new DataView("subcatlist", new EntityDataSource("\\App\\Shop\\Entity\\ProductGroup", "parent_id=" . $id), $this, 'OnCatRow')); + $this->subcatlistp->add(new DataView("subcatlist", new EntityDataSource("\\App\\Modules\\Shop\\Entity\\ProductGroup", "parent_id=" . $id), $this, 'OnCatRow')); if ($id > 0) $this->subcatlistp->subcatlist->Reload(); $this->add(new Panel("newlistp")); - $this->newlistp->add(new DataView("newlist", new EntityDataSource("\\App\\Shop\\Entity\\Product", "", "product_id desc", 12), $this, 'OnNewRow'))->Reload(); + $this->newlistp->add(new DataView("newlist", new EntityDataSource("\\App\\Modules\\Shop\\Entity\\Product", "", "product_id desc", 12), $this, 'OnNewRow'))->Reload(); } public function OnCatRow($datarow) { diff --git a/www/app/shop/pages/manufacturers.php b/www/app/modules/shop/pages/manufacturers.php similarity index 95% rename from www/app/shop/pages/manufacturers.php rename to www/app/modules/shop/pages/manufacturers.php index d3a478f0c..08de5980f 100644 --- a/www/app/shop/pages/manufacturers.php +++ b/www/app/modules/shop/pages/manufacturers.php @@ -1,12 +1,12 @@ add(new \Zippy\Html\Panel('list')); - $panellist->add(new DataView("manufacturerslist", new \ZCL\DB\EntityDataSource('\App\Shop\Entity\Manufacturer'), $this, 'OnAddRow')); + $panellist->add(new DataView("manufacturerslist", new \ZCL\DB\EntityDataSource('\App\Modules\Shop\Entity\Manufacturer'), $this, 'OnAddRow')); $panellist->add(new \Zippy\Html\Link\ClickLink('addnew', $this, 'OnAddClick')); diff --git a/www/app/shop/pages/options.php b/www/app/modules/shop/pages/options.php similarity index 98% rename from www/app/shop/pages/options.php rename to www/app/modules/shop/pages/options.php index c63a57869..c1c864448 100644 --- a/www/app/shop/pages/options.php +++ b/www/app/modules/shop/pages/options.php @@ -1,6 +1,6 @@ basketlist = Basket::getBasket()->list; if (Basket::getBasket()->isEmpty()) { - App::Redirect("\\App\\Shop\\Pages\\Catalog", 0); + App::Redirect("\\App\\Modules\\Shop\\Pages\\Catalog", 0); } else { $this->OnUpdate($this); } @@ -164,7 +164,7 @@ public function OnSave($sender) { public function OnAddRow(\Zippy\Html\DataList\DataRow $datarow) { $item = $datarow->getDataItem(); $datarow->setDataItem($item); - $datarow->add(new \Zippy\Html\Link\RedirectLink('pname', '\App\Shop\Pages\ProductView', $item->product_id))->setValue($item->productname); + $datarow->add(new \Zippy\Html\Link\RedirectLink('pname', '\App\Modules\Shop\Pages\ProductView', $item->product_id))->setValue($item->productname); $datarow->add(new Label('price', $item->price)); $datarow->add(new TextInput('quantity', new \Zippy\Binding\PropertyBinding($item, 'quantity'))); $datarow->add(new \Zippy\Html\Link\ClickLink('delete', $this, 'OnDelete')); diff --git a/www/app/shop/pages/productlist.php b/www/app/modules/shop/pages/productlist.php similarity index 96% rename from www/app/shop/pages/productlist.php rename to www/app/modules/shop/pages/productlist.php index 24cdf491c..3d79d2e0d 100644 --- a/www/app/shop/pages/productlist.php +++ b/www/app/modules/shop/pages/productlist.php @@ -1,6 +1,6 @@ listpanel->add(new Form('searchform'))->onSubmit($this, 'searchformOnSubmit'); $this->listpanel->searchform->add(new TextInput('skeyword')); $this->listpanel->searchform->add(new CheckBox('sstatus')); - $this->listpanel->searchform->add(new DropDownChoice('smanuf', \App\Shop\Entity\Manufacturer::findArray('manufacturername', '', 'manufacturername'))); + $this->listpanel->searchform->add(new DropDownChoice('smanuf', \App\Modules\Shop\Entity\Manufacturer::findArray('manufacturername', '', 'manufacturername'))); $this->listpanel->searchform->add(new ClickLink('sclear'))->onClick($this, 'onSClear'); $this->listpanel->add(new Form('sortform')); $this->listpanel->sortform->add(new DropDownChoice('sorting'))->onChange($this, 'sortingOnChange'); @@ -84,8 +84,8 @@ public function __construct() { $editform->add(new TextArea('edescshort')); $editform->add(new TextArea('edescdet')); - $editform->add(new DropDownChoice('emanuf', \App\Shop\Entity\Manufacturer::findArray('manufacturername', '', 'manufacturername'))); - $editform->add(new DropDownChoice('egroup', \App\Shop\Entity\ProductGroup::findArray('groupname', 'group_id not in (select parent_id from shop_productgroups)', 'groupname'))); + $editform->add(new DropDownChoice('emanuf', \App\Modules\Shop\Entity\Manufacturer::findArray('manufacturername', '', 'manufacturername'))); + $editform->add(new DropDownChoice('egroup', \App\Modules\Shop\Entity\ProductGroup::findArray('groupname', 'group_id not in (select parent_id from shop_productgroups)', 'groupname'))); diff --git a/www/app/shop/pages/productview.php b/www/app/modules/shop/pages/productview.php similarity index 94% rename from www/app/shop/pages/productview.php rename to www/app/modules/shop/pages/productview.php index d8d8ae54f..17a572ba0 100644 --- a/www/app/shop/pages/productview.php +++ b/www/app/modules/shop/pages/productview.php @@ -1,16 +1,16 @@ add(new \Zippy\Html\DataList\DataView('attributelist', new \Zippy\Html\DataList\ArrayDataSource($list), $this, 'OnAddAttributeRow'))->Reload(); $this->add(new ClickLink('buy', $this, 'OnBuy')); $this->add(new ClickLink('addtocompare', $this, 'OnAddCompare')); - $this->add(new RedirectLink('compare', "\\App\\Shop\\Pages\\Compare"))->setVisible(false); + $this->add(new RedirectLink('compare', "\\App\\Modules\\Shop\\Pages\\Compare"))->setVisible(false); $form = $this->add(new \Zippy\Html\Form\Form('formcomment')); $form->onSubmit($this, 'OnComment'); @@ -125,7 +125,7 @@ public function OnAddAttributeRow(\Zippy\Html\DataList\DataRow $datarow) { public function OnBuy($sender) { $product = Product::load($this->product_id); $product->quantity = 1; - \App\Shop\Basket::getBasket()->addProduct($product); + \App\Modules\Shop\Basket::getBasket()->addProduct($product); $this->setSuccess("Товар добавлен в корзину"); //$this->resetURL(); App::RedirectURI('/pcat/' . $product->group_id); @@ -134,7 +134,7 @@ public function OnBuy($sender) { //добавить к форме сравнения public function OnAddCompare($sender) { $product = Product::load($this->product_id); - $comparelist = \App\Shop\CompareList::getCompareList(); + $comparelist = \App\Modules\Shop\CompareList::getCompareList(); if (false == $comparelist->addProduct($product)) { $this->setWarn('Добавлять можно только товары с одинаковой категорией'); return; @@ -146,7 +146,7 @@ public function OnAddCompare($sender) { public function OnComment($sender) { - $comment = new \App\Shop\Entity\ProductComment(); + $comment = new \App\Modules\Shop\Entity\ProductComment(); $comment->product_id = $this->product_id; $comment->author = $this->formcomment->nick->getText(); $comment->comment = $this->formcomment->comment->getText(); @@ -172,7 +172,7 @@ protected function beforeRender() { App::addJavaScript("openComments();", true); $this->gotocomment = false; } - if (\App\Shop\CompareList::getCompareList()->hasProsuct($this->product_id)) { + if (\App\Modules\Shop\CompareList::getCompareList()->hasProsuct($this->product_id)) { $this->compare->setVisible(true); $this->addtocompare->setVisible(false); } else { diff --git a/www/app/pages/base.php b/www/app/pages/base.php index e58bfa347..582c01383 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -63,6 +63,8 @@ public function __construct($params = null) { $this->_tvars["shop"] = $_config['modules']['shop'] == 1; $this->_tvars["ocstore"] = $_config['modules']['ocstore'] == 1; + //если включен хоть один модуль + $this->_tvars["modules"] = $this->_tvars["shop"] || $this->_tvars["ocstore"]; } diff --git a/www/app/pages/options.php b/www/app/pages/options.php index f93a00436..b9d9db709 100644 --- a/www/app/pages/options.php +++ b/www/app/pages/options.php @@ -87,7 +87,7 @@ public function __construct() { $this->listpan->filter->add(new CheckBox('fdic'))->setChecked(true); $this->listpan->filter->add(new CheckBox('frep'))->setChecked(true); $this->listpan->filter->add(new CheckBox('freg'))->setChecked(true); - $this->listpan->filter->add(new CheckBox('fshop'))->setChecked(true); + $this->listpan->add(new ClickLink('addnew'))->onClick($this, 'addnewOnClick'); $this->listpan->add(new DataView('metarow', $this->metadatads, $this, 'metarowOnRow'))->Reload(); @@ -158,9 +158,7 @@ public function filterOnSubmit($sender) { if ($this->listpan->filter->freg->isChecked()) { $where .= " or meta_type = 3"; } - if ($this->listpan->filter->fshop->isChecked()) { - $where .= " or meta_type = 5"; - } + $this->metadatads->setWhere($where); diff --git a/www/index.php b/www/index.php index 912eec57b..6eabbd4d4 100644 --- a/www/index.php +++ b/www/index.php @@ -29,8 +29,8 @@ $app = new \App\Application(); - if($_config['common']['shop'] == 1){ - $app->Run('\App\Shop\Pages\Main'); + if($_config['modules']['shop'] == 1){ + $app->Run('\App\Modules\Shop\Pages\Main'); } else { $app->Run('\App\Pages\Main'); } diff --git a/www/templates/shop/pages/aboutus.html b/www/templates/modules/shop/pages/aboutus.html similarity index 100% rename from www/templates/shop/pages/aboutus.html rename to www/templates/modules/shop/pages/aboutus.html diff --git a/www/templates/shop/pages/base.html b/www/templates/modules/shop/pages/base.html similarity index 100% rename from www/templates/shop/pages/base.html rename to www/templates/modules/shop/pages/base.html diff --git a/www/templates/shop/pages/catalog.html b/www/templates/modules/shop/pages/catalog.html similarity index 100% rename from www/templates/shop/pages/catalog.html rename to www/templates/modules/shop/pages/catalog.html diff --git a/www/templates/shop/pages/compare.html b/www/templates/modules/shop/pages/compare.html similarity index 100% rename from www/templates/shop/pages/compare.html rename to www/templates/modules/shop/pages/compare.html diff --git a/www/templates/shop/pages/contact.html b/www/templates/modules/shop/pages/contact.html similarity index 100% rename from www/templates/shop/pages/contact.html rename to www/templates/modules/shop/pages/contact.html diff --git a/www/templates/shop/pages/delivery.html b/www/templates/modules/shop/pages/delivery.html similarity index 100% rename from www/templates/shop/pages/delivery.html rename to www/templates/modules/shop/pages/delivery.html diff --git a/www/templates/shop/pages/grouplist.html b/www/templates/modules/shop/pages/grouplist.html similarity index 100% rename from www/templates/shop/pages/grouplist.html rename to www/templates/modules/shop/pages/grouplist.html diff --git a/www/templates/shop/pages/main.html b/www/templates/modules/shop/pages/main.html similarity index 100% rename from www/templates/shop/pages/main.html rename to www/templates/modules/shop/pages/main.html diff --git a/www/templates/shop/pages/manufacturers.html b/www/templates/modules/shop/pages/manufacturers.html similarity index 100% rename from www/templates/shop/pages/manufacturers.html rename to www/templates/modules/shop/pages/manufacturers.html diff --git a/www/templates/shop/pages/options.html b/www/templates/modules/shop/pages/options.html similarity index 100% rename from www/templates/shop/pages/options.html rename to www/templates/modules/shop/pages/options.html diff --git a/www/templates/shop/pages/order.html b/www/templates/modules/shop/pages/order.html similarity index 100% rename from www/templates/shop/pages/order.html rename to www/templates/modules/shop/pages/order.html diff --git a/www/templates/shop/pages/productlist.html b/www/templates/modules/shop/pages/productlist.html similarity index 100% rename from www/templates/shop/pages/productlist.html rename to www/templates/modules/shop/pages/productlist.html diff --git a/www/templates/shop/pages/productview.html b/www/templates/modules/shop/pages/productview.html similarity index 100% rename from www/templates/shop/pages/productview.html rename to www/templates/modules/shop/pages/productview.html diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html index 2b79dada7..800df5444 100644 --- a/www/templates/pages/base.html +++ b/www/templates/pages/base.html @@ -151,26 +151,15 @@

Zippy Скла

- {{#shop}} -
  • - - -
    • - {{/shop}} - {{#ocstore}} + + {{#modules}}
  • -
    • {{/ocstore}} - + + {{/modules}}
  • - {{#shop}} -
    - - - -
    - {{/shop}} + Добавить diff --git a/www/templates/pages/users.html b/www/templates/pages/users.html index 651e94190..a17d28324 100644 --- a/www/templates/pages/users.html +++ b/www/templates/pages/users.html @@ -88,11 +88,7 @@

    Редактирование пользователя

    -
    - - - -
    + {{#ocstore}}
    @@ -101,6 +97,14 @@

    Редактирование пользователя

    {{/ocstore}} + {{#shop}} +
    + + + +
    + {{/shop}} +
    From 0e0e75772872823d6303b8395d8d70d6cb12e8c3 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 10 Jun 2019 00:30:04 +0300 Subject: [PATCH 05/17] snumber --- www/app/entity/doc/goodsissue.php | 8 ++- www/app/entity/doc/goodsreceipt.php | 12 +++- www/app/entity/doc/moveitem.php | 9 ++- www/app/entity/doc/prodreceipt.php | 3 +- www/app/entity/doc/transitem.php | 2 +- www/app/entity/stock.php | 18 ++++-- www/app/pages/doc/goodsissue.php | 2 + www/app/pages/doc/goodsreceipt.php | 20 ++++++- www/app/pages/doc/moveitem.php | 4 +- www/app/pages/main.php | 2 + www/app/pages/register/stocklist.php | 16 +++++- www/app/pages/report/outcome.php | 4 +- www/app/pages/users.php | 5 ++ www/app/widgets/wminqty.php | 4 +- www/app/widgets/wsdate.php | 64 +++++++++++++++++++++ www/templates/pages/base.html | 2 +- www/templates/pages/doc/goodsissue.html | 19 +++++- www/templates/pages/doc/goodsreceipt.html | 33 +++++++++-- www/templates/pages/doc/moveitem.html | 12 +++- www/templates/pages/main.html | 8 ++- www/templates/pages/reference/itemlist.html | 2 + www/templates/pages/register/stocklist.html | 12 +++- www/templates/pages/users.html | 13 +++-- www/templates/printforms/goodsreceipt.tpl | 2 +- www/templates/printforms/outcome.tpl | 22 ++++--- www/templates/widgets/wsdate.html | 25 ++++++++ 26 files changed, 273 insertions(+), 50 deletions(-) create mode 100644 www/app/widgets/wsdate.php create mode 100644 www/templates/widgets/wsdate.html diff --git a/www/app/entity/doc/goodsissue.php b/www/app/entity/doc/goodsissue.php index 05bce1742..650ba0be0 100644 --- a/www/app/entity/doc/goodsissue.php +++ b/www/app/entity/doc/goodsissue.php @@ -23,8 +23,14 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + + $detail[] = array("no" => $i++, - "tovar_name" => $value['itemname'], + "tovar_name" => $name, "tovar_code" => $value['item_code'], "quantity" => H::fqty($value['quantity']), "msr" => $value['msr'], diff --git a/www/app/entity/doc/goodsreceipt.php b/www/app/entity/doc/goodsreceipt.php index decf662cd..c9b566a38 100644 --- a/www/app/entity/doc/goodsreceipt.php +++ b/www/app/entity/doc/goodsreceipt.php @@ -18,8 +18,14 @@ public function generateReport() { $detail = array(); foreach ($this->detaildata as $value) { + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + + $detail[] = array("no" => $i++, - "itemname" => $value['itemname'], + "itemname" => $name, "itemcode" => $value['item_code'], "quantity" => H::fqty($value['quantity']), "price" => $value['price'], @@ -49,8 +55,8 @@ public function Execute() { //аналитика foreach ($this->detaildata as $row) { - $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'], true); - + $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'],$row['sdate'], true); + $sc = new Entry($this->document_id, $row['amount'], $row['quantity']); $sc->setStock($stock->stock_id); diff --git a/www/app/entity/doc/moveitem.php b/www/app/entity/doc/moveitem.php index 6bcab7ca1..248206ce9 100644 --- a/www/app/entity/doc/moveitem.php +++ b/www/app/entity/doc/moveitem.php @@ -31,7 +31,7 @@ public function Execute() { $sc->save(); - $stockto = Stock::getStock($this->headerdata['storeto'], $value['item_id'], $value['partion'],$value['snumber'],, true); + $stockto = Stock::getStock($this->headerdata['storeto'], $value['item_id'], $value['partion'],$value['snumber'],$value['sdate'], true); $sc = new Entry($this->document_id, $value['quantity'] * $value['partion'], $value['quantity']); $sc->setStock($stockto->stock_id); @@ -53,8 +53,13 @@ public function generateReport() { $i = 1; $detail = array(); foreach ($this->detaildata as $value) { + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + $detail[] = array("no" => $i++, - "item_name" => $value['itemname'], + "item_name" => $name, "price" => $value['partion'], "msr" => $value['msr'], "quantity" => H::fqty($value['quantity'])); diff --git a/www/app/entity/doc/prodreceipt.php b/www/app/entity/doc/prodreceipt.php index 65e3fc958..8e318c8ac 100644 --- a/www/app/entity/doc/prodreceipt.php +++ b/www/app/entity/doc/prodreceipt.php @@ -50,8 +50,7 @@ public function Execute() { //аналитика foreach ($this->detaildata as $row) { - $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'], true); - + $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'],$row['sdate'], true); $sc = new Entry($this->document_id, $row['amount'], $row['quantity']); $sc->setStock($stock->stock_id); diff --git a/www/app/entity/doc/transitem.php b/www/app/entity/doc/transitem.php index 29d567b54..46c4b22ef 100644 --- a/www/app/entity/doc/transitem.php +++ b/www/app/entity/doc/transitem.php @@ -32,7 +32,7 @@ public function Execute() { $ti = Item::load($this->headerdata['toitem']); $price = round(($this->amount ) / $this->headerdata["toquantity"]); - $stockto = Stock::getStock($this->headerdata['storefrom'], $ti->item_id, $price,"", true); + $stockto = Stock::getStock($this->headerdata['storefrom'], $ti->item_id, $price,"","", true); $sc = new Entry($this->document_id, $this->headerdata["toquantity"] * $price, $this->headerdata["toquantity"]); $sc->setStock($stockto->stock_id); diff --git a/www/app/entity/stock.php b/www/app/entity/stock.php index e3c73a33c..9972aaf0b 100644 --- a/www/app/entity/stock.php +++ b/www/app/entity/stock.php @@ -15,7 +15,11 @@ protected function init() { $this->stock_id = 0; } - + protected function afterLoad() { + if(strlen($this->sdate)>0) $this->sdate = strtotime($this->sdate); + + } + /** * Метод для получения имени ТМЦ с ценой для выпадающих списков * @@ -26,7 +30,7 @@ protected function init() { public static function findArrayAC($store, $partname = "") { - $criteria = "qty <> 0 and disabled <> 1 "; + $criteria = "qty <> 0 and disabled <> 1 and store_id=".$store; if (strlen($partname) > 0) { $partname = self::qstr('%' . $partname . '%'); $criteria .= " and (itemname like {$partname} or item_code like {$partname} or snumber like {$partname} )"; @@ -36,6 +40,9 @@ public static function findArrayAC($store, $partname = "") { $list = array(); foreach ($entitylist as $key => $value) { + if(strlen($value->snumber)>0){ + $value->itemname .= ' (' .$value->snumber.','. date('Y-m-d',$value->sdate). ')' ; + } $list[$key] = $value->itemname . ', ' . \App\Helper::fqty($value->partion); } @@ -50,14 +57,14 @@ public static function findArrayAC($store, $partname = "") { * @param mixed $price Цена * @param mixed $create Создать если не существует */ - public static function getStock($store_id, $item_id, $price,$snumber="", $create = false) { + public static function getStock($store_id, $item_id, $price,$snumber="",$sdate=0, $create = false) { $conn = \ZDB\DB::getConnect(); $where = "store_id = {$store_id} and item_id = {$item_id} and partion = {$price} "; if (strlen($snumber) > 0) { - $snumber = self::qstr('%' . $snumber . '%'); - $where .= " and snumber = {$snumber} "; + + $where .= " and snumber = ".self::qstr($snumber ); } //на случай если удален @@ -70,6 +77,7 @@ public static function getStock($store_id, $item_id, $price,$snumber="", $create $stock->item_id = $item_id; $stock->partion = $price; $stock->snumber = $snumber; + if($sdate >0)$stock->sdate = $sdate; $stock->save(); } diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php index 4f6c43368..2224e5fdb 100644 --- a/www/app/pages/doc/goodsissue.php +++ b/www/app/pages/doc/goodsissue.php @@ -202,6 +202,8 @@ public function detailOnRow($row) { $row->add(new Label('partion', $item->partion)); $row->add(new Label('code', $item->item_code)); $row->add(new Label('msr', $item->msr)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); diff --git a/www/app/pages/doc/goodsreceipt.php b/www/app/pages/doc/goodsreceipt.php index 498f97d02..499b9c696 100644 --- a/www/app/pages/doc/goodsreceipt.php +++ b/www/app/pages/doc/goodsreceipt.php @@ -68,7 +68,10 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new SubmitLink('addnewitem'))->onClick($this, 'addnewitemOnClick'); $this->editdetail->add(new TextInput('editquantity'))->setText("1"); $this->editdetail->add(new TextInput('editprice')); + $this->editdetail->add(new TextInput('editsnumber')); + $this->editdetail->add(new Date('editsdate')); + $this->editdetail->add(new Button('cancelrow'))->onClick($this, 'cancelrowOnClick'); $this->editdetail->add(new SubmitButton('saverow'))->onClick($this, 'saverowOnClick'); @@ -173,6 +176,8 @@ public function detailOnRow($row) { $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); $row->add(new Label('msr', $item->msr)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('amount', round($item->quantity * $item->price))); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); @@ -188,6 +193,8 @@ public function editOnClick($sender) { $this->editdetail->editquantity->setText($item->quantity); $this->editdetail->editprice->setText($item->price); + $this->editdetail->editsnumber->setText($item->snumber); + $this->editdetail->editsdate->setDate($item->sdate); $this->editdetail->edititem->setKey($item->item_id); @@ -230,11 +237,18 @@ public function saverowOnClick($sender) { $item->quantity = $this->editdetail->editquantity->getText(); $item->price = $this->editdetail->editprice->getText(); + if ($item->price == 0) { $this->setWarn("Не указана цена"); } - - + $item->snumber = $this->editdetail->editsnumber->getText(); + $item->sdate = $this->editdetail->editsdate->getDate(); + if($item->sdate == false)$item->sdate=''; + if(strlen($item->snumber)>0 && strlen($item->sdate )==0) { + $this->setError("К серии должна быть введена дата"); + return; + + } unset($this->_itemlist[$this->_rowid]); $this->_itemlist[$item->item_id] = $item; $this->editdetail->setVisible(false); @@ -248,6 +262,8 @@ public function saverowOnClick($sender) { $this->editdetail->editquantity->setText("1"); $this->editdetail->editprice->setText(""); + $this->editdetail->editsnumber->setText(""); + $this->editdetail->editsdate->setText(""); } public function cancelrowOnClick($sender) { diff --git a/www/app/pages/doc/moveitem.php b/www/app/pages/doc/moveitem.php index 3fa5da13e..d74c9dc79 100644 --- a/www/app/pages/doc/moveitem.php +++ b/www/app/pages/doc/moveitem.php @@ -82,9 +82,11 @@ public function __construct($docid = 0) { public function detailOnRow($row) { $item = $row->getDataItem(); - + $row->add(new Label('item', $item->itemname)); $row->add(new Label('msr', $item->msr)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('quantity', H::fqty($item->quantity))); diff --git a/www/app/pages/main.php b/www/app/pages/main.php index 4f568a43a..af58f4d22 100644 --- a/www/app/pages/main.php +++ b/www/app/pages/main.php @@ -20,6 +20,8 @@ public function __construct() { $this->add(new \App\Widgets\WNoliq("wnoliq")); $this->add(new \App\Widgets\WMinQty("wminqty")); + + $this->add(new \App\Widgets\Wsdate("wsdate")); } public function getPageInfo() { diff --git a/www/app/pages/register/stocklist.php b/www/app/pages/register/stocklist.php index e8d54029d..e19710fe0 100644 --- a/www/app/pages/register/stocklist.php +++ b/www/app/pages/register/stocklist.php @@ -77,7 +77,21 @@ public function OnFilter($sender) { public function detailistOnRow($row) { $stock = $row->getDataItem(); $row->add(new Label('storename', $stock->storename)); - + $row->add(new Label('snumber', $stock->snumber)); + $row->add(new Label('sdate', '')); + + $row->add(new Label('sedate', '')); + + + + if(strlen($stock->snumber)>0 ){ + $row->sdate->setText(date('Y-m-d',$stock->sdate)); + if($this->_item->term>0){ + $term = strtotime("+{$this->_item->term} month",$stock->sdate); + $row->sedate->setText(date('Y-m-d',$term)); + + } + } $row->add(new Label('partion', $stock->partion)); $stock->qty = $stock->qty - $stock->wqty + $stock->rqty; $q = "" . H::fqty($stock->qty) . ""; diff --git a/www/app/pages/report/outcome.php b/www/app/pages/report/outcome.php index 2d1d69631..1ac6185c6 100644 --- a/www/app/pages/report/outcome.php +++ b/www/app/pages/report/outcome.php @@ -105,9 +105,9 @@ private function generateReport() { order by i.`itemname` "; } - if ($type == 2) { //по постащикам + if ($type == 2) { //по покупателям $sql = " - select c.`customer_name` as itemname,c.`customer_id`, sum(0-e.`amount`) as summa + select c.`customer_name` as itemname,c.`customer_id`, sum(0-e.`amount`) as summa, sum(e.extcode*(0-e.`quantity`)) as navar from `entrylist_view` e join `customers` c on c.`customer_id` = e.`customer_id` diff --git a/www/app/pages/users.php b/www/app/pages/users.php index eb3a67942..bbcce28bf 100644 --- a/www/app/pages/users.php +++ b/www/app/pages/users.php @@ -51,6 +51,7 @@ public function __construct() { $this->editpan->editform->add(new CheckBox('editwdebitors')); $this->editpan->editform->add(new CheckBox('editwnoliq')); $this->editpan->editform->add(new CheckBox('editwminqty')); + $this->editpan->editform->add(new CheckBox('editwsdate')); //модули $this->editpan->editform->add(new CheckBox('editocstore')); $this->editpan->editform->add(new CheckBox('editshop')); @@ -99,6 +100,8 @@ public function onEdit($sender) { $this->editpan->editform->editwnoliq->setChecked(true); if (strpos($this->user->widgets, 'wminqty') !== false) $this->editpan->editform->editwminqty->setChecked(true); + if (strpos($this->user->widgets, 'wsdate') !== false) + $this->editpan->editform->editwsdate->setChecked(true); if (strpos($this->user->modules, 'ocstore') !== false) $this->editpan->editform->editocstore->setChecked(true); @@ -166,6 +169,8 @@ public function saveOnClick($sender) { $widgets = $widgets . ',wnoliq'; if ($this->editpan->editform->editwminqty->isChecked()) $widgets = $widgets . ',wminqty'; + if ($this->editpan->editform->editwsdate->isChecked()) + $widgets = $widgets . ',wsdate'; $this->user->widgets = trim($widgets, ','); diff --git a/www/app/widgets/wminqty.php b/www/app/widgets/wminqty.php index 86be5084b..eadd9204b 100644 --- a/www/app/widgets/wminqty.php +++ b/www/app/widgets/wminqty.php @@ -42,7 +42,7 @@ public function __construct($id) { } } - $mqlist = $this->add(new DataView('mqlist', new ArrayDataSource($data), $this, 'noliqlistOnRow')); + $mqlist = $this->add(new DataView('mqlist', new ArrayDataSource($data), $this, 'mqlistOnRow')); $mqlist->setPageSize(10); $this->add(new \Zippy\Html\DataList\Paginator("mqpag", $mqlist)); $mqlist->Reload(); @@ -53,7 +53,7 @@ public function __construct($id) { }; } - public function noliqlistOnRow($row) { + public function mqlistOnRow($row) { $item = $row->getDataItem(); $row->add(new Label('itemname', $item->itemname)); diff --git a/www/app/widgets/wsdate.php b/www/app/widgets/wsdate.php new file mode 100644 index 000000000..4283cf0f1 --- /dev/null +++ b/www/app/widgets/wsdate.php @@ -0,0 +1,64 @@ +widgets, 'wsdate') !== false || System::getUser()->userlogin == 'admin'); + + $conn = $conn = \ZDB\DB::getConnect(); + $data = array(); + + + $sql = "select item_id, itemname,qty,minqty from items_view where qty < minqty + + + "; + + if ($visible) { + $rs = $conn->Execute($sql); + + foreach ($rs as $row) { + + $data[$row['item_id']] = new DataItem($row); + } + } + + $mqlist = $this->add(new DataView('mqlist', new ArrayDataSource($data), $this, 'sdlistOnRow')); + $mqlist->setPageSize(10); + $this->add(new \Zippy\Html\DataList\Paginator("mqpag", $mqlist)); + $mqlist->Reload(); + + + if (count($data) == 0 || $visible == false) { + $this->setVisible(false); + }; + } + + public function sdlistOnRow($row) { + $item = $row->getDataItem(); + + $row->add(new Label('itemname', $item->itemname)); + $row->add(new Label('qty', Helper::fqty($item->qty))); + $row->add(new Label('minqty', Helper::fqty($item->minqty))); + } + +} diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html index 800df5444..0ed93f3ce 100644 --- a/www/templates/pages/base.html +++ b/www/templates/pages/base.html @@ -108,7 +108,7 @@

    Zippy Скла -
    +
    diff --git a/www/templates/pages/doc/goodsissue.html b/www/templates/pages/doc/goodsissue.html index 77da5942c..2b290773b 100644 --- a/www/templates/pages/doc/goodsissue.html +++ b/www/templates/pages/doc/goodsissue.html @@ -96,6 +96,11 @@

    Расходная накладная

    Название Код Ед. + {{#usesnumber}} + Серия + Дата + {{/usesnumber}} + Партия Кол. @@ -108,6 +113,11 @@

    Расходная накладная

    + {{#usesnumber}} + + + {{/usesnumber}} + @@ -118,7 +128,14 @@

    Расходная накладная

    - Всего: + + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/goodsreceipt.html b/www/templates/pages/doc/goodsreceipt.html index 9acbd7730..fc299b761 100644 --- a/www/templates/pages/doc/goodsreceipt.html +++ b/www/templates/pages/doc/goodsreceipt.html @@ -66,6 +66,10 @@

    Приходная накладная

    Наименование Код Ед. + {{#usesnumber}} + Серия + Дата + {{/usesnumber}} Кол. Цена @@ -78,6 +82,10 @@

    Приходная накладная

    + {{#usesnumber}} + + + {{/usesnumber}} @@ -87,7 +95,12 @@

    Приходная накладная

    - Всего: + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} @@ -119,14 +132,22 @@

    Ввод товара

    - - + Добавить новый - - -
    + {{#usesnumber}} +
    + + + +
    +
    + + + +
    + {{/usesnumber}}
    diff --git a/www/templates/pages/doc/moveitem.html b/www/templates/pages/doc/moveitem.html index 2dc75f6f6..ee2d5b42c 100644 --- a/www/templates/pages/doc/moveitem.html +++ b/www/templates/pages/doc/moveitem.html @@ -37,12 +37,15 @@

    Перемещение ТМЦ

    -
    +
    - + {{#usesnumber}} + + + {{/usesnumber}} @@ -50,7 +53,10 @@

    Перемещение ТМЦ

    - + {{#usesnumber}} + + + {{/usesnumber}} diff --git a/www/templates/pages/main.html b/www/templates/pages/main.html index 64333d744..bf80d27c8 100644 --- a/www/templates/pages/main.html +++ b/www/templates/pages/main.html @@ -3,7 +3,13 @@
    -
    + {{#usesnumber}} +
    +
    +
    + {{/usesnumber}} + +
    diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html index 6925bec37..150b19281 100644 --- a/www/templates/pages/reference/itemlist.html +++ b/www/templates/pages/reference/itemlist.html @@ -121,12 +121,14 @@

    Редактирование товара

    + {{#usesnumber}}
    + {{/usesnumber}}
    diff --git a/www/templates/pages/register/stocklist.html b/www/templates/pages/register/stocklist.html index 174533891..46fcd7e54 100644 --- a/www/templates/pages/register/stocklist.html +++ b/www/templates/pages/register/stocklist.html @@ -65,7 +65,11 @@

    Название Ед.СерияДатаКол. Цена
    - + {{#usesnumber}} + + + + {{/usesnumber}} @@ -76,7 +80,11 @@

    - + {{#usesnumber}} + + + + {{/usesnumber}} diff --git a/www/templates/pages/users.html b/www/templates/pages/users.html index a17d28324..3848c22b1 100644 --- a/www/templates/pages/users.html +++ b/www/templates/pages/users.html @@ -55,7 +55,6 @@

    Редактирование пользователя

    -
    @@ -65,25 +64,27 @@

    Редактирование пользователя

    -
    - - +
    -
    -
    + {{#usesnumber}} +
    + + +
    + {{/usesnumber}}
    diff --git a/www/templates/printforms/goodsreceipt.tpl b/www/templates/printforms/goodsreceipt.tpl index 36bfc0fa8..44067e25c 100644 --- a/www/templates/printforms/goodsreceipt.tpl +++ b/www/templates/printforms/goodsreceipt.tpl @@ -1,4 +1,4 @@ - +
    СкладСерияДата серииГоден до Зак. цена Кол. На сумму
    diff --git a/www/templates/printforms/outcome.tpl b/www/templates/printforms/outcome.tpl index 5af2dee07..05ae8fd69 100644 --- a/www/templates/printforms/outcome.tpl +++ b/www/templates/printforms/outcome.tpl @@ -4,13 +4,13 @@ - {{#_type1}} - @@ -20,6 +20,7 @@ + {{#_detail}} @@ -31,6 +32,7 @@ + {{/_detail}} @@ -38,35 +40,37 @@ {{/_type1}} {{#_type2}} - - + + {{#_detail}} - + + {{/_detail}}
    + Период с {{datefrom}} по {{dateto}}

    + Продажи по товарам

    Кол. На суммуПрибыль
    {{qty}} {{summa}} {{navar}}
    + Продажи по покупателям

    НаименованиеНаименование На сумму
    {{name}}{{name}} {{summa}}
    {{/_type2}} {{#_type3}} - + Продажи по датам

    @@ -76,6 +80,7 @@ На сумму + {{#_detail}} @@ -89,6 +94,7 @@ {{summa}} + {{/_detail}} @@ -96,7 +102,7 @@ {{/_type3}} {{#_type4}} - + Услуги и работы

    @@ -107,6 +113,7 @@ Кол. На сумму + {{#_detail}} @@ -118,6 +125,7 @@ {{qty}} {{summa}} + {{/_detail}} diff --git a/www/templates/widgets/wsdate.html b/www/templates/widgets/wsdate.html new file mode 100644 index 000000000..db60a9b6a --- /dev/null +++ b/www/templates/widgets/wsdate.html @@ -0,0 +1,25 @@ + + + +
    +
    Минимальное количество
    + + + + + + + + + + + + + +
    ТоварВ наличииМинимум
    +
    + +
    + + + From e8e0cf1a52545e333fc8546c3304b19c8d7d48dd Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 10 Jun 2019 16:47:48 +0300 Subject: [PATCH 06/17] =?UTF-8?q?=D1=83=D1=87=D0=B5=D1=82=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B8=D1=8F=D0=BC=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/db.sql | 62 ++++++++++++----------- db/initdata.sql | 5 +- db/update.sql | 1 - www/app/entity/doc/prodissue.php | 8 ++- www/app/entity/doc/prodreceipt.php | 9 +++- www/app/entity/doc/retcustissue.php | 7 ++- www/app/entity/doc/returnissue.php | 7 ++- www/app/pages/doc/prodissue.php | 2 + www/app/pages/doc/prodreceipt.php | 17 ++++++- www/app/pages/doc/retcustissue.php | 2 + www/app/pages/doc/returnissue.php | 2 + www/app/pages/main.php | 2 +- www/app/widgets/wsdate.php | 52 ++++++++++++------- www/templates/pages/doc/goodsissue.html | 2 +- www/templates/pages/doc/prodissue.html | 19 ++++++- www/templates/pages/doc/prodreceipt.html | 34 +++++++++++-- www/templates/pages/doc/retcustissue.html | 17 ++++++- www/templates/pages/doc/returnissue.html | 17 ++++++- www/templates/printforms/returnissue.tpl | 12 +---- www/templates/widgets/wsdate.html | 16 +++--- 20 files changed, 209 insertions(+), 84 deletions(-) delete mode 100644 db/update.sql diff --git a/db/db.sql b/db/db.sql index 0cbe46409..e9c4382ba 100644 --- a/db/db.sql +++ b/db/db.sql @@ -19,7 +19,7 @@ CREATE TABLE `customers` ( `email` varchar(64) DEFAULT NULL, `phone` varchar(64) DEFAULT NULL, PRIMARY KEY (`customer_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=9 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `customers_view`; /*!50001 DROP VIEW IF EXISTS `customers_view`*/; @@ -40,7 +40,7 @@ CREATE TABLE `docrel` ( `doc2` int(11) DEFAULT NULL, KEY `doc1` (`doc1`), KEY `doc2` (`doc2`) -) DEFAULT CHARSET=utf8 COMMENT='����� ����� �����������'; +) DEFAULT CHARSET=utf8 ; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `documents`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -61,7 +61,7 @@ CREATE TABLE `documents` ( KEY `document_date` (`document_date`), KEY `customer_id` (`customer_id`), KEY `user_id` (`user_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=88 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `documents_view`; /*!50001 DROP VIEW IF EXISTS `documents_view`*/; @@ -93,7 +93,7 @@ CREATE TABLE `employees` ( `detail` mediumtext, `emp_name` varchar(64) NOT NULL, PRIMARY KEY (`employee_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `entrylist`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -111,7 +111,7 @@ CREATE TABLE `entrylist` ( PRIMARY KEY (`entry_id`), KEY `document_id` (`document_id`), KEY `stock_id` (`stock_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=98 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -122,7 +122,7 @@ CREATE TABLE `entrylist` ( /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -/*!50003 CREATE*/ /*!50003 TRIGGER `entrylist_after_ins_tr` AFTER INSERT ON `entrylist` +/*!50003 CREATE*/ /*!50003 TRIGGER `entrylist_after_ins_tr` AFTER INSERT ON `entrylist` FOR EACH ROW BEGIN @@ -188,7 +188,7 @@ CREATE TABLE `equipments` ( `detail` mediumtext, `description` text, PRIMARY KEY (`eq_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `eventlist`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -204,7 +204,7 @@ CREATE TABLE `eventlist` ( PRIMARY KEY (`event_id`), KEY `user_id` (`user_id`), KEY `customer_id` (`customer_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `eventlist_view`; /*!50001 DROP VIEW IF EXISTS `eventlist_view`*/; @@ -250,7 +250,7 @@ CREATE TABLE `images` ( `mime` varchar(16) DEFAULT NULL, `thumb` longblob, PRIMARY KEY (`image_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `item_cat`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -259,7 +259,7 @@ CREATE TABLE `item_cat` ( `cat_id` int(11) NOT NULL AUTO_INCREMENT, `cat_name` varchar(255) NOT NULL, PRIMARY KEY (`cat_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `item_set`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -270,7 +270,7 @@ CREATE TABLE `item_set` ( `pitem_id` int(11) DEFAULT '0', `qty` int(11) DEFAULT '0', PRIMARY KEY (`set_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `item_set_view`; /*!50001 DROP VIEW IF EXISTS `item_set_view`*/; @@ -302,7 +302,7 @@ CREATE TABLE `items` ( KEY `item_code` (`item_code`), KEY `itemname` (`itemname`), KEY `cat_id` (`cat_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=13 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `items_view`; /*!50001 DROP VIEW IF EXISTS `items_view`*/; @@ -333,7 +333,7 @@ CREATE TABLE `messages` ( `item_id` int(11) NOT NULL, `item_type` int(11) DEFAULT NULL, PRIMARY KEY (`message_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `messages_view`; /*!50001 DROP VIEW IF EXISTS `messages_view`*/; @@ -356,12 +356,12 @@ CREATE TABLE `metadata` ( `meta_type` tinyint(11) NOT NULL, `description` varchar(255) DEFAULT NULL, `meta_name` varchar(255) NOT NULL, - `menugroup` varchar(255) DEFAULT NULL COMMENT '??????????? ??? ???????', + `menugroup` varchar(255) DEFAULT NULL , `notes` text NOT NULL, `disabled` tinyint(4) NOT NULL, `smartmenu` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`meta_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=46 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `notifies`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -374,7 +374,7 @@ CREATE TABLE `notifies` ( `message` text NOT NULL, PRIMARY KEY (`notify_id`), KEY `user_id` (`user_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `options`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -392,7 +392,7 @@ CREATE TABLE `parealist` ( `pa_id` int(11) NOT NULL AUTO_INCREMENT, `pa_name` varchar(255) NOT NULL, PRIMARY KEY (`pa_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `services`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -402,7 +402,7 @@ CREATE TABLE `services` ( `service_name` varchar(255) NOT NULL, `detail` text, PRIMARY KEY (`service_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_attributes`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -415,7 +415,7 @@ CREATE TABLE `shop_attributes` ( `valueslist` varchar(255) DEFAULT NULL, `showinlist` tinyint(1) DEFAULT NULL, PRIMARY KEY (`attribute_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_attributes_order`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -426,7 +426,7 @@ CREATE TABLE `shop_attributes_order` ( `pg_id` int(11) NOT NULL, `ordern` int(11) NOT NULL, PRIMARY KEY (`order_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=6 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_attributes_view`; /*!50001 DROP VIEW IF EXISTS `shop_attributes_view`*/; @@ -451,7 +451,7 @@ CREATE TABLE `shop_attributevalues` ( `attributevalue` varchar(255) NOT NULL, PRIMARY KEY (`attributevalue_id`), KEY `attribute_id` (`attribute_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=33 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_manufacturers`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -461,7 +461,7 @@ CREATE TABLE `shop_manufacturers` ( `manufacturername` varchar(255) NOT NULL, `url` varchar(255) NOT NULL, PRIMARY KEY (`manufacturer_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_prod_comments`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -476,7 +476,7 @@ CREATE TABLE `shop_prod_comments` ( `moderated` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`comment_id`), KEY `product_id` (`product_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_productgroups`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -488,7 +488,7 @@ CREATE TABLE `shop_productgroups` ( `mpath` varchar(1024) DEFAULT NULL, `image_id` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`group_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_productgroups_view`; /*!50001 DROP VIEW IF EXISTS `shop_productgroups_view`*/; @@ -522,7 +522,7 @@ CREATE TABLE `shop_products` ( `comments` int(11) DEFAULT '0', PRIMARY KEY (`product_id`), KEY `group_id` (`group_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `shop_products_view`; /*!50001 DROP VIEW IF EXISTS `shop_products_view`*/; @@ -556,9 +556,11 @@ CREATE TABLE `store_stock` ( `partion` int(11) DEFAULT NULL, `store_id` int(11) NOT NULL, `qty` decimal(11,3) DEFAULT '0.000', + `snumber` varchar(64) DEFAULT NULL, + `sdate` date DEFAULT NULL, PRIMARY KEY (`stock_id`), KEY `item_id` (`item_id`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=20 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `store_stock_view`; /*!50001 DROP VIEW IF EXISTS `store_stock_view`*/; @@ -578,6 +580,8 @@ SET character_set_client = utf8; 1 AS `disabled`, 1 AS `storename`, 1 AS `qty`, + 1 AS `snumber`, + 1 AS `sdate`, 1 AS `rqty`, 1 AS `wqty`*/; SET character_set_client = @saved_cs_client; @@ -589,7 +593,7 @@ CREATE TABLE `stores` ( `storename` varchar(64) DEFAULT NULL, `description` varchar(255) DEFAULT NULL, PRIMARY KEY (`store_id`) -) DEFAULT CHARSET=utf8 COMMENT='????? ????????'; +) AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 ; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `users`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -606,7 +610,7 @@ CREATE TABLE `users` ( `options` text, PRIMARY KEY (`user_id`), UNIQUE KEY `userlogin` (`userlogin`) -) DEFAULT CHARSET=utf8; +) AUTO_INCREMENT=8 DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `users_view`; /*!50001 DROP VIEW IF EXISTS `users_view`*/; @@ -762,7 +766,7 @@ SET character_set_client = @saved_cs_client; /*!50001 SET collation_connection = latin1_swedish_ci */; /*!50001 CREATE */ /*!50013 */ -/*!50001 VIEW `store_stock_view` AS select `st`.`stock_id` AS `stock_id`,`st`.`item_id` AS `item_id`,`st`.`partion` AS `partion`,`st`.`store_id` AS `store_id`,`i`.`itemname` AS `itemname`,`i`.`item_code` AS `item_code`,`i`.`cat_id` AS `cat_id`,`i`.`msr` AS `msr`,`i`.`bar_code` AS `bar_code`,`i`.`cat_name` AS `cat_name`,`i`.`disabled` AS `disabled`,`stores`.`storename` AS `storename`,`st`.`qty` AS `qty`,(0 - (select coalesce(sum(`el`.`quantity`),0) from `entrylist_view` `el` where ((`el`.`stock_id` = `st`.`stock_id`) and (`el`.`quantity` < 0) and (`el`.`document_date` > cast(now() as date))))) AS `rqty`,(select coalesce(sum(`el`.`quantity`),0) from `entrylist_view` `el` where ((`el`.`stock_id` = `st`.`stock_id`) and (`el`.`quantity` > 0) and (`el`.`document_date` > cast(now() as date)))) AS `wqty` from ((`store_stock` `st` join `items_view` `i` on(((`i`.`item_id` = `st`.`item_id`) and (`i`.`disabled` <> 1)))) join `stores` on((`stores`.`store_id` = `st`.`store_id`))) */; +/*!50001 VIEW `store_stock_view` AS select `st`.`stock_id` AS `stock_id`,`st`.`item_id` AS `item_id`,`st`.`partion` AS `partion`,`st`.`store_id` AS `store_id`,`i`.`itemname` AS `itemname`,`i`.`item_code` AS `item_code`,`i`.`cat_id` AS `cat_id`,`i`.`msr` AS `msr`,`i`.`bar_code` AS `bar_code`,`i`.`cat_name` AS `cat_name`,`i`.`disabled` AS `disabled`,`stores`.`storename` AS `storename`,`st`.`qty` AS `qty`,`st`.`snumber` AS `snumber`,`st`.`sdate` AS `sdate`,(0 - (select coalesce(sum(`el`.`quantity`),0) from `entrylist_view` `el` where ((`el`.`stock_id` = `st`.`stock_id`) and (`el`.`quantity` < 0) and (`el`.`document_date` > cast(now() as date))))) AS `rqty`,(select coalesce(sum(`el`.`quantity`),0) from `entrylist_view` `el` where ((`el`.`stock_id` = `st`.`stock_id`) and (`el`.`quantity` > 0) and (`el`.`document_date` > cast(now() as date)))) AS `wqty` from ((`store_stock` `st` join `items_view` `i` on(((`i`.`item_id` = `st`.`item_id`) and (`i`.`disabled` <> 1)))) join `stores` on((`stores`.`store_id` = `st`.`store_id`))) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; diff --git a/db/initdata.sql b/db/initdata.sql index f70d4a1fa..e6a157205 100644 --- a/db/initdata.sql +++ b/db/initdata.sql @@ -9,7 +9,7 @@ INSERT INTO `users` ( `userlogin`, `userpass`, `createdon`, `email`, `acl`, `sma INSERT INTO `stores` ( `storename`, `description`) VALUES( 'Основной склад', ''); -INSERT INTO `options` (`optname`, `optvalue`) VALUES('common', 'a:13:{s:8:"firmname";s:20:"Наша фирма";s:8:"defstore";s:2:"19";s:9:"qtydigits";s:1:"2";s:5:"cdoll";s:1:"2";s:5:"ceuro";s:1:"5";s:4:"crub";s:3:"0.4";s:6:"price1";s:18:"Розничная";s:6:"price2";s:14:"Оптовая";s:6:"price3";s:0:"";s:6:"price4";s:0:"";s:6:"price5";s:0:"";s:6:"useset";b:0;s:6:"useval";b:0;}'); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('common', 'a:14:{s:8:"firmname";s:20:"Наша фирма";s:8:"defstore";s:2:"19";s:9:"qtydigits";s:1:"0";s:5:"cdoll";s:1:"2";s:5:"ceuro";s:1:"5";s:4:"crub";s:3:"0.4";s:6:"price1";s:18:"Розничная";s:6:"price2";s:14:"Оптовая";s:6:"price3";s:0:"";s:6:"price4";s:0:"";s:6:"price5";s:0:"";s:6:"useset";b:0;s:10:"usesnumber";b:0;s:6:"useval";b:0;}'); INSERT INTO `options` (`optname`, `optvalue`) VALUES('shop', 'N;'); INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(1, 4, 'Склады', 'StoreList', 'Товары', '', 0, 0); @@ -33,9 +33,6 @@ INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `men INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(20, 2, 'Оплата по нарядам', 'EmpTask', '', '', 0, 0); INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(21, 2, 'Закупки', 'Income', '', '', 0, 0); INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(22, 2, 'Продажи', 'Outcome', '', '', 0, 0); -INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(23, 5, 'Бренды', 'Manufacturers', '', '', 0, 0); -INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(24, 5, 'Группы товаров', 'GroupList', '', '', 0, 0); -INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(26, 5, 'Товары', 'ProductList', '', '', 0, 0); INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(27, 3, 'Заказы клиентов', 'OrderList', '', '', 0, 0); INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(28, 1, 'Заказ', 'Order', 'Продажи', '', 0, 0); INSERT INTO `metadata` (`meta_id`, `meta_type`, `description`, `meta_name`, `menugroup`, `notes`, `disabled`, `smartmenu`) VALUES(30, 1, 'Оприходование с производства', 'ProdReceipt', 'Производство', 'Оприходование готовой продукции и полуфабрикатов с производства на склад. ', 0, 0); diff --git a/db/update.sql b/db/update.sql deleted file mode 100644 index 558b6f936..000000000 --- a/db/update.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `store_stock` ADD `snumber` VARCHAR(64) NULL AFTER `qty`, ADD `sdate` DATE NULL AFTER `snumber`; \ No newline at end of file diff --git a/www/app/entity/doc/prodissue.php b/www/app/entity/doc/prodissue.php index 1e48a9844..fdadf64dd 100644 --- a/www/app/entity/doc/prodissue.php +++ b/www/app/entity/doc/prodissue.php @@ -23,8 +23,14 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + + $detail[] = array("no" => $i++, - "tovar_name" => $value['itemname'], + "tovar_name" => $name, "tovar_code" => $value['item_code'], "quantity" => H::fqty($value['quantity']), "price" => $value['price'], diff --git a/www/app/entity/doc/prodreceipt.php b/www/app/entity/doc/prodreceipt.php index 8e318c8ac..fe519b1e3 100644 --- a/www/app/entity/doc/prodreceipt.php +++ b/www/app/entity/doc/prodreceipt.php @@ -18,8 +18,15 @@ public function generateReport() { $detail = array(); foreach ($this->detaildata as $value) { + + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + + $detail[] = array("no" => $i++, - "itemname" => $value['itemname'], + "itemname" => $name, "itemcode" => $value['item_code'], "quantity" => H::fqty($value['quantity']), "price" => $value['price'], diff --git a/www/app/entity/doc/retcustissue.php b/www/app/entity/doc/retcustissue.php index 74eddf9b2..69f299c5d 100644 --- a/www/app/entity/doc/retcustissue.php +++ b/www/app/entity/doc/retcustissue.php @@ -23,8 +23,13 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + $detail[] = array("no" => $i++, - "tovar_name" => $value['itemname'], + "tovar_name" => $name, "tovar_code" => $value['item_code'], "quantity" => H::fqty($value['quantity']), "msr" => $value['msr'], diff --git a/www/app/entity/doc/returnissue.php b/www/app/entity/doc/returnissue.php index 833a4cc2e..0f2affa3d 100644 --- a/www/app/entity/doc/returnissue.php +++ b/www/app/entity/doc/returnissue.php @@ -23,8 +23,13 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { + $name =$value['itemname']; + if(strlen($value['snumber'])>0){ + $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + } + $detail[] = array("no" => $i++, - "tovar_name" => $value['itemname'], + "tovar_name" => $name, "quantity" => H::fqty($value['quantity']), "price" => $value['price'], "msr" => $value['msr'], diff --git a/www/app/pages/doc/prodissue.php b/www/app/pages/doc/prodissue.php index dc9da9dfe..f8d07f20f 100644 --- a/www/app/pages/doc/prodissue.php +++ b/www/app/pages/doc/prodissue.php @@ -101,6 +101,8 @@ public function detailOnRow($row) { $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('amount', round($item->quantity * $item->price))); $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); diff --git a/www/app/pages/doc/prodreceipt.php b/www/app/pages/doc/prodreceipt.php index 7260c0dc4..47391a6ea 100644 --- a/www/app/pages/doc/prodreceipt.php +++ b/www/app/pages/doc/prodreceipt.php @@ -62,6 +62,8 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new TextInput('editquantity'))->setText("1"); $this->editdetail->add(new TextInput('editprice')); + $this->editdetail->add(new TextInput('editsnumber')); + $this->editdetail->add(new Date('editsdate')); $this->editdetail->add(new Button('cancelrow'))->onClick($this, 'cancelrowOnClick'); $this->editdetail->add(new SubmitButton('saverow'))->onClick($this, 'saverowOnClick'); @@ -101,6 +103,8 @@ public function detailOnRow($row) { $row->add(new Label('msr', $item->msr)); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('amount', round($item->quantity * $item->price))); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); @@ -116,6 +120,8 @@ public function editOnClick($sender) { $this->editdetail->editquantity->setText($item->quantity); $this->editdetail->editprice->setText($item->price); + $this->editdetail->editsnumber->setText($item->snumber); + $this->editdetail->editsdate->setDate($item->sdate); $this->editdetail->edititem->setKey($item->item_id); @@ -169,7 +175,14 @@ public function saverowOnClick($sender) { if ($item->price == 0) { $this->setWarn("Не указана цена"); } - + $item->snumber = $this->editdetail->editsnumber->getText(); + $item->sdate = $this->editdetail->editsdate->getDate(); + if($item->sdate == false)$item->sdate=''; + if(strlen($item->snumber)>0 && strlen($item->sdate )==0) { + $this->setError("К серии должна быть введена дата"); + return; + + } unset($this->_itemlist[$this->_rowid]); @@ -185,6 +198,8 @@ public function saverowOnClick($sender) { $this->editdetail->editquantity->setText("1"); $this->editdetail->editprice->setText(""); + $this->editdetail->editsnumber->setText(""); + $this->editdetail->editsdate->setText(""); } public function cancelrowOnClick($sender) { diff --git a/www/app/pages/doc/retcustissue.php b/www/app/pages/doc/retcustissue.php index 5460bf604..9f6c03879 100644 --- a/www/app/pages/doc/retcustissue.php +++ b/www/app/pages/doc/retcustissue.php @@ -132,6 +132,8 @@ public function detailOnRow($row) { $row->add(new Label('tovar', $item->itemname)); $row->add(new Label('code', $item->item_code)); $row->add(new Label('msr', $item->msr)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); diff --git a/www/app/pages/doc/returnissue.php b/www/app/pages/doc/returnissue.php index e7f730119..e15ff9753 100644 --- a/www/app/pages/doc/returnissue.php +++ b/www/app/pages/doc/returnissue.php @@ -118,6 +118,8 @@ public function detailOnRow($row) { $row->add(new Label('tovar', $item->itemname)); $row->add(new Label('msr', $item->msr)); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); $row->add(new Label('quantity', H::fqty($item->quantity))); diff --git a/www/app/pages/main.php b/www/app/pages/main.php index af58f4d22..f71798a69 100644 --- a/www/app/pages/main.php +++ b/www/app/pages/main.php @@ -21,7 +21,7 @@ public function __construct() { $this->add(new \App\Widgets\WMinQty("wminqty")); - $this->add(new \App\Widgets\Wsdate("wsdate")); + $this->add(new \App\Widgets\Wsdate("wsdate"))->setVisible($this->_tvars["usesnumber"]); } public function getPageInfo() { diff --git a/www/app/widgets/wsdate.php b/www/app/widgets/wsdate.php index 4283cf0f1..fc1101050 100644 --- a/www/app/widgets/wsdate.php +++ b/www/app/widgets/wsdate.php @@ -11,6 +11,7 @@ use \App\Entity\Doc\Document; use \Carbon\Carbon; use \App\Entity\Item; +use \App\Entity\Stock; use \App\DataItem; /** @@ -27,38 +28,51 @@ public function __construct($id) { $conn = $conn = \ZDB\DB::getConnect(); $data = array(); - - $sql = "select item_id, itemname,qty,minqty from items_view where qty < minqty - + + - "; if ($visible) { - $rs = $conn->Execute($sql); - - foreach ($rs as $row) { - - $data[$row['item_id']] = new DataItem($row); + $items= Item::find("item_id in(select item_id from store_stock where sdate is not null)"); + + $stock= Stock::find("sdate is not null"); + + + foreach ($stock as $st) { + $item = $items[$st->item_id] ; + if($item->term >0){ + $edate = strtotime("+{$item->term} month",$st->sdate); + if($edate < time()){ + $st->edate = $edate; + $data[$row['item_id']] = $st; + } + } + } } - $mqlist = $this->add(new DataView('mqlist', new ArrayDataSource($data), $this, 'sdlistOnRow')); - $mqlist->setPageSize(10); - $this->add(new \Zippy\Html\DataList\Paginator("mqpag", $mqlist)); - $mqlist->Reload(); - + $sdlist = $this->add(new DataView('sdlist', new ArrayDataSource($data), $this, 'sdlistOnRow')); + $sdlist->setPageSize(10); + $this->add(new \Zippy\Html\DataList\Paginator("sdpag", $sdlist)); + $sdlist->Reload(); + unset($items); + unset($stock); + if (count($data) == 0 || $visible == false) { $this->setVisible(false); }; } public function sdlistOnRow($row) { - $item = $row->getDataItem(); - - $row->add(new Label('itemname', $item->itemname)); - $row->add(new Label('qty', Helper::fqty($item->qty))); - $row->add(new Label('minqty', Helper::fqty($item->minqty))); + $stock = $row->getDataItem(); + + $row->add(new Label('storename', $stock->storename)); + $row->add(new Label('itemname', $stock->itemname)); + $row->add(new Label('snumber', $stock->snumber)); + $row->add(new Label('edate', date('Y-m-d',$stock->edate))); + $row->add(new Label('qty', Helper::fqty($stock->qty))) ; + } } diff --git a/www/templates/pages/doc/goodsissue.html b/www/templates/pages/doc/goodsissue.html index 2b290773b..0f0dfa813 100644 --- a/www/templates/pages/doc/goodsissue.html +++ b/www/templates/pages/doc/goodsissue.html @@ -101,7 +101,7 @@

    Расходная накладная

    Дата {{/usesnumber}} - Партия + Уч. цена Кол. Цена diff --git a/www/templates/pages/doc/prodissue.html b/www/templates/pages/doc/prodissue.html index 3a29cb0af..910e4610b 100644 --- a/www/templates/pages/doc/prodissue.html +++ b/www/templates/pages/doc/prodissue.html @@ -55,7 +55,11 @@

    Списание на производство

    Название Код Ед. - + {{#usesnumber}} + Серия + Дата + {{/usesnumber}} + Кол. Цена @@ -68,6 +72,10 @@

    Списание на производство

    + {{#usesnumber}} + + + {{/usesnumber}} @@ -77,7 +85,14 @@

    Списание на производство

    - Всего: + + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/prodreceipt.html b/www/templates/pages/doc/prodreceipt.html index 9e218d365..5922b8cb4 100644 --- a/www/templates/pages/doc/prodreceipt.html +++ b/www/templates/pages/doc/prodreceipt.html @@ -54,6 +54,11 @@

    Оприходование с производства

    Наименование Код Ед. + {{#usesnumber}} + Серия + Дата + {{/usesnumber}} + Кол. Цена @@ -66,6 +71,11 @@

    Оприходование с производства

    + {{#usesnumber}} + + + {{/usesnumber}} + @@ -75,7 +85,14 @@

    Оприходование с производства

    - Всего: + + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + @@ -115,7 +132,18 @@

    Ввод товара

    - + {{#usesnumber}} +
    + + + +
    +
    + + + +
    + {{/usesnumber}}
    Ввод товара

    - +
    diff --git a/www/templates/pages/doc/retcustissue.html b/www/templates/pages/doc/retcustissue.html index a84c091a2..30518256c 100644 --- a/www/templates/pages/doc/retcustissue.html +++ b/www/templates/pages/doc/retcustissue.html @@ -47,7 +47,10 @@

    Возврат поставщику

    Название Код Ед. - + {{#usesnumber}} + Серия + Дата + {{/usesnumber}} Кол. Цена @@ -59,6 +62,10 @@

    Возврат поставщику

    + {{#usesnumber}} + + + {{/usesnumber}} @@ -69,7 +76,13 @@

    Возврат поставщику

    - Всего: + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/returnissue.html b/www/templates/pages/doc/returnissue.html index 64a806f8c..86106ca32 100644 --- a/www/templates/pages/doc/returnissue.html +++ b/www/templates/pages/doc/returnissue.html @@ -47,6 +47,10 @@

    Возвратная накладная

    Название Ед. + {{#usesnumber}} + Серия + Дата + {{/usesnumber}} Кол. @@ -58,6 +62,10 @@

    Возвратная накладная

    + {{#usesnumber}} + + + {{/usesnumber}} @@ -68,7 +76,14 @@

    Возвратная накладная

    - Всего: + + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/printforms/returnissue.tpl b/www/templates/printforms/returnissue.tpl index 01ea4f4df..fa823953b 100644 --- a/www/templates/printforms/returnissue.tpl +++ b/www/templates/printforms/returnissue.tpl @@ -1,14 +1,6 @@ - - - - - - - - - + @@ -25,7 +17,7 @@ - + diff --git a/www/templates/widgets/wsdate.html b/www/templates/widgets/wsdate.html index db60a9b6a..0e5ce8bba 100644 --- a/www/templates/widgets/wsdate.html +++ b/www/templates/widgets/wsdate.html @@ -7,17 +7,21 @@
    Минимальное количество
          
    №НаименованиеНаименование Кол. Цена
    + - - + + + - + + - - + + +
    Склад ТоварВ наличииМинимумСерияГоден доКол.
    -
    +
    From 2c41e3216e1969a2ceb668af81f2d31041851c90 Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 11 Jun 2019 00:46:13 +0300 Subject: [PATCH 07/17] =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B5=D0=B6=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=81=D1=87=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/category.php | 2 +- www/app/entity/moneyfund.php | 17 ++++ www/app/entity/pay.php | 18 +++++ www/app/pages/reference/categorylist.php | 3 + www/app/pages/reference/mflist.php | 97 +++++++++++++++++++++++ www/templates/pages/reference/mflist.html | 52 ++++++++++++ 6 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 www/app/entity/moneyfund.php create mode 100644 www/app/entity/pay.php create mode 100644 www/app/pages/reference/mflist.php create mode 100644 www/templates/pages/reference/mflist.html diff --git a/www/app/entity/category.php b/www/app/entity/category.php index e48e21cfe..d266cda4b 100644 --- a/www/app/entity/category.php +++ b/www/app/entity/category.php @@ -3,7 +3,7 @@ namespace App\Entity; /** - * Клас-сущность категория товара + * Класс-сущность категория товара * * @table=item_cat * @keyfield=cat_id diff --git a/www/app/entity/moneyfund.php b/www/app/entity/moneyfund.php new file mode 100644 index 000000000..b9c1a75be --- /dev/null +++ b/www/app/entity/moneyfund.php @@ -0,0 +1,17 @@ +mf_id = 0; + } + +} diff --git a/www/app/entity/pay.php b/www/app/entity/pay.php new file mode 100644 index 000000000..4b737f748 --- /dev/null +++ b/www/app/entity/pay.php @@ -0,0 +1,18 @@ +pl_id = 0; + } + +} \ No newline at end of file diff --git a/www/app/pages/reference/categorylist.php b/www/app/pages/reference/categorylist.php index c591d6e70..f09b2d4c8 100644 --- a/www/app/pages/reference/categorylist.php +++ b/www/app/pages/reference/categorylist.php @@ -12,6 +12,9 @@ use Zippy\Html\Panel; use App\Entity\Category; +/** +* справочник категорийтоваров +*/ class CategoryList extends \App\Pages\Base { private $_category; diff --git a/www/app/pages/reference/mflist.php b/www/app/pages/reference/mflist.php new file mode 100644 index 000000000..2bdb33d3d --- /dev/null +++ b/www/app/pages/reference/mflist.php @@ -0,0 +1,97 @@ +add(new Panel('categorytable'))->setVisible(true); + $this->categorytable->add(new DataView('categorylist', new \ZCL\DB\EntityDataSource('\App\Entity\Category'), $this, 'categorylistOnRow'))->Reload(); + $this->categorytable->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); + $this->add(new Form('categorydetail'))->setVisible(false); + $this->categorydetail->add(new TextInput('editcat_name')); + $this->categorydetail->add(new SubmitButton('save'))->onClick($this, 'saveOnClick'); + $this->categorydetail->add(new Button('cancel'))->onClick($this, 'cancelOnClick'); + } + + public function categorylistOnRow($row) { + $item = $row->getDataItem(); + + $row->add(new Label('cat_name', $item->cat_name)); + $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); + $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); + } + + public function deleteOnClick($sender) { + if (false == \App\ACL::checkEditRef('CategoryList')) + return; + + + $cat_id = $sender->owner->getDataItem()->cat_id; + $cnt = \App\Entity\Item::findCnt(" disabled <> 1 and cat_id=" . $cat_id); + if ($cnt > 0) { + $this->setError('Нельзя удалить категорию с товарами'); + return; + } + Category::delete($cat_id); + $this->categorytable->categorylist->Reload(); + } + + public function editOnClick($sender) { + $this->_category = $sender->owner->getDataItem(); + $this->categorytable->setVisible(false); + $this->categorydetail->setVisible(true); + $this->categorydetail->editcat_name->setText($this->_category->cat_name); + } + + public function addOnClick($sender) { + $this->categorytable->setVisible(false); + $this->categorydetail->setVisible(true); + // Очищаем форму + $this->categorydetail->clean(); + + $this->_category = new Category(); + } + + public function saveOnClick($sender) { + if (false == \App\ACL::checkEditRef('CategoryList')) + return; + + $this->_category->cat_name = $this->categorydetail->editcat_name->getText(); + if ($this->_category->cat_name == '') { + $this->setError("Введите наименование"); + return; + } + + $this->_category->Save(); + $this->categorydetail->setVisible(false); + $this->categorytable->setVisible(true); + $this->categorytable->categorylist->Reload(); + } + + public function cancelOnClick($sender) { + $this->categorytable->setVisible(true); + $this->categorydetail->setVisible(false); + } + +} diff --git a/www/templates/pages/reference/mflist.html b/www/templates/pages/reference/mflist.html new file mode 100644 index 000000000..fc8b2767a --- /dev/null +++ b/www/templates/pages/reference/mflist.html @@ -0,0 +1,52 @@ + + + + + +
    +
    +
    +

    Денежные счета

    + Добавить + + + + + + + + + + + + +
    Название
    + + +
    + + +
    +
    +
    +
    + +
    +
    + + +
    + + +    + + +
    +
    +
    + + + + + \ No newline at end of file From 55639eedaeb2cf3b1fc064e0d1aa6edfe41e7616 Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 11 Jun 2019 00:48:24 +0300 Subject: [PATCH 08/17] =?UTF-8?q?use=20=20=D1=81=D0=BB=D0=B5=D1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/doc/document.php | 4 +-- www/app/entity/doc/goodsissue.php | 6 ++-- www/app/entity/doc/goodsreceipt.php | 4 +-- www/app/entity/doc/moveitem.php | 8 ++--- www/app/entity/doc/order.php | 6 ++-- www/app/entity/doc/ordercust.php | 4 +-- www/app/entity/doc/prodissue.php | 6 ++-- www/app/entity/doc/prodreceipt.php | 4 +-- www/app/entity/doc/retcustissue.php | 6 ++-- www/app/entity/doc/returnissue.php | 6 ++-- www/app/entity/doc/serviceact.php | 2 +- www/app/entity/doc/serviceorder.php | 2 +- www/app/entity/doc/task.php | 4 +-- www/app/entity/doc/transitem.php | 10 +++--- www/app/entity/doc/warranty.php | 2 +- www/app/modules/shop/pages/main.php | 10 +++--- www/app/pages/base.php | 16 ++++----- www/app/pages/doc/goodsreceipt.php | 38 ++++++++++---------- www/app/pages/doc/moveitem.php | 34 +++++++++--------- www/app/pages/doc/ordercust.php | 38 ++++++++++---------- www/app/pages/doc/prodreceipt.php | 36 +++++++++---------- www/app/pages/doc/serviceact.php | 34 +++++++++--------- www/app/pages/doc/serviceorder.php | 36 +++++++++---------- www/app/pages/doc/task.php | 46 ++++++++++++------------ www/app/pages/doc/transitem.php | 34 +++++++++--------- www/app/pages/doc/warranty.php | 34 +++++++++--------- www/app/pages/import.php | 22 ++++++------ www/app/pages/notifylist.php | 14 ++++---- www/app/pages/options.php | 4 +-- www/app/pages/reference/categorylist.php | 18 +++++----- www/app/pages/reference/customerlist.php | 36 +++++++++---------- www/app/pages/reference/employeelist.php | 26 +++++++------- www/app/pages/reference/itemlist.php | 2 +- www/app/pages/reference/prodarealist.php | 18 +++++----- www/app/pages/reference/servicelist.php | 18 +++++----- www/app/pages/reference/storelist.php | 26 +++++++------- www/app/pages/register/doclist.php | 32 ++++++++--------- www/app/pages/register/gilist.php | 30 ++++++++-------- www/app/pages/register/grlist.php | 30 ++++++++-------- www/app/pages/register/ordercustlist.php | 30 ++++++++-------- www/app/pages/register/orderlist.php | 26 +++++++------- www/app/pages/register/prodlist.php | 30 ++++++++-------- www/app/pages/report/abc.php | 12 +++---- www/app/pages/report/emptask.php | 20 +++++------ www/app/pages/report/income.php | 20 +++++------ www/app/pages/report/itemactivity.php | 2 +- www/app/pages/report/outcome.php | 20 +++++------ www/app/pages/report/prod.php | 20 +++++------ www/app/pages/showdoc.php | 2 +- www/app/pages/userprofile.php | 14 ++++---- www/app/widgets/docview.php | 28 +++++++-------- 51 files changed, 465 insertions(+), 465 deletions(-) diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index c5e28c1c1..6974ee872 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -2,8 +2,8 @@ namespace App\Entity\Doc; -use App\System; -use App\Helper; +use \App\System; +use \App\Helper; /** * Класс-сущность документ diff --git a/www/app/entity/doc/goodsissue.php b/www/app/entity/doc/goodsissue.php index 650ba0be0..6f6b2a150 100644 --- a/www/app/entity/doc/goodsissue.php +++ b/www/app/entity/doc/goodsissue.php @@ -2,9 +2,9 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; -use App\Util; +use \App\Entity\Entry; +use \App\Helper as H; +use \App\Util; /** * Класс-сущность документ расходная накладая diff --git a/www/app/entity/doc/goodsreceipt.php b/www/app/entity/doc/goodsreceipt.php index c9b566a38..d33609c0c 100644 --- a/www/app/entity/doc/goodsreceipt.php +++ b/www/app/entity/doc/goodsreceipt.php @@ -2,8 +2,8 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; +use \App\Entity\Entry; +use \App\Helper as H; /** * Класс-сущность документ приходная накладая diff --git a/www/app/entity/doc/moveitem.php b/www/app/entity/doc/moveitem.php index 248206ce9..2065d518d 100644 --- a/www/app/entity/doc/moveitem.php +++ b/www/app/entity/doc/moveitem.php @@ -2,10 +2,10 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Entity\Stock; -use App\Entity\Store; -use App\Helper as H; +use \App\Entity\Entry; +use \App\Entity\Stock; +use \App\Entity\Store; +use \App\Helper as H; /** * Класс-сущность локумент перемещения товаров diff --git a/www/app/entity/doc/order.php b/www/app/entity/doc/order.php index f2e697de0..788ffaf9c 100644 --- a/www/app/entity/doc/order.php +++ b/www/app/entity/doc/order.php @@ -2,9 +2,9 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; -use App\Util; +use \App\Entity\Entry; +use \App\Helper as H; +use \App\Util; /** * Класс-сущность документ расходная накладая diff --git a/www/app/entity/doc/ordercust.php b/www/app/entity/doc/ordercust.php index 9dfa47f3a..62cdc5d0c 100644 --- a/www/app/entity/doc/ordercust.php +++ b/www/app/entity/doc/ordercust.php @@ -2,8 +2,8 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; +use \App\Entity\Entry; +use \App\Helper as H; /** * Класс-сущность документ приходная накладая diff --git a/www/app/entity/doc/prodissue.php b/www/app/entity/doc/prodissue.php index fdadf64dd..dc1c32fca 100644 --- a/www/app/entity/doc/prodissue.php +++ b/www/app/entity/doc/prodissue.php @@ -2,9 +2,9 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; -use App\Util; +use \App\Entity\Entry; +use \App\Helper as H; +use \App\Util; /** * Класс-сущность документ списание в производство diff --git a/www/app/entity/doc/prodreceipt.php b/www/app/entity/doc/prodreceipt.php index fe519b1e3..43cafda39 100644 --- a/www/app/entity/doc/prodreceipt.php +++ b/www/app/entity/doc/prodreceipt.php @@ -2,8 +2,8 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; +use \App\Entity\Entry; +use \App\Helper as H; /** * Класс-сущность документ оприходование с производства diff --git a/www/app/entity/doc/retcustissue.php b/www/app/entity/doc/retcustissue.php index 69f299c5d..74de4a953 100644 --- a/www/app/entity/doc/retcustissue.php +++ b/www/app/entity/doc/retcustissue.php @@ -2,9 +2,9 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; -use App\Util; +use \App\Entity\Entry; +use \App\Helper as H; +use \App\Util; /** * Класс-сущность документ возврат поставщику diff --git a/www/app/entity/doc/returnissue.php b/www/app/entity/doc/returnissue.php index 0f2affa3d..48da5d5a3 100644 --- a/www/app/entity/doc/returnissue.php +++ b/www/app/entity/doc/returnissue.php @@ -2,9 +2,9 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; -use App\Util; +use \App\Entity\Entry; +use \App\Helper as H; +use \App\Util; /** * Класс-сущность документ возвратная накладная diff --git a/www/app/entity/doc/serviceact.php b/www/app/entity/doc/serviceact.php index 67a86b485..5220c1395 100644 --- a/www/app/entity/doc/serviceact.php +++ b/www/app/entity/doc/serviceact.php @@ -2,7 +2,7 @@ namespace App\Entity\Doc; -use App\Entity\Entry; +use \App\Entity\Entry; /** * Класс-сущность локумент акт о выполненных работах diff --git a/www/app/entity/doc/serviceorder.php b/www/app/entity/doc/serviceorder.php index 915636b04..c99ddd25d 100644 --- a/www/app/entity/doc/serviceorder.php +++ b/www/app/entity/doc/serviceorder.php @@ -2,7 +2,7 @@ namespace App\Entity\Doc; -use App\Entity\Entry; +use \App\Entity\Entry; /** * Класс-сущность заказ на услуги diff --git a/www/app/entity/doc/task.php b/www/app/entity/doc/task.php index 56e5f42b7..ed97ba50f 100644 --- a/www/app/entity/doc/task.php +++ b/www/app/entity/doc/task.php @@ -2,8 +2,8 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Helper as H; +use \App\Entity\Entry; +use \App\Helper as H; /** * Класс-сущность наряд diff --git a/www/app/entity/doc/transitem.php b/www/app/entity/doc/transitem.php index 46c4b22ef..4e23f45b7 100644 --- a/www/app/entity/doc/transitem.php +++ b/www/app/entity/doc/transitem.php @@ -2,11 +2,11 @@ namespace App\Entity\Doc; -use App\Entity\Entry; -use App\Entity\Stock; -use App\Entity\Store; -use App\Entity\Item; -use App\Helper as H; +use \App\Entity\Entry; +use \App\Entity\Stock; +use \App\Entity\Store; +use \App\Entity\Item; +use \App\Helper as H; /** * Класс-сущность локумент перекомплектация товаров diff --git a/www/app/entity/doc/warranty.php b/www/app/entity/doc/warranty.php index 64043dfa4..ebe7745ea 100644 --- a/www/app/entity/doc/warranty.php +++ b/www/app/entity/doc/warranty.php @@ -2,7 +2,7 @@ namespace App\Entity\Doc; -use App\Helper as H; +use \App\Helper as H; /** * Класс-сущность документ гарантийного талон diff --git a/www/app/modules/shop/pages/main.php b/www/app/modules/shop/pages/main.php index a60920774..241f26377 100644 --- a/www/app/modules/shop/pages/main.php +++ b/www/app/modules/shop/pages/main.php @@ -3,11 +3,11 @@ namespace App\Modules\Shop\Pages; use Carbon\Carbon; -use Zippy\Html\DataList\ArrayDataSource; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Label; -use Zippy\Html\Panel; -use Zippy\Html\Link\BookmarkableLink; +use \Zippy\Html\DataList\ArrayDataSource; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Label; +use \Zippy\Html\Panel; +use \Zippy\Html\Link\BookmarkableLink; use \App\Modules\Shop\Entity\ProductGroup; use \App\Modules\Shop\Helper; use \ZCL\DB\EntityDataSource; diff --git a/www/app/pages/base.php b/www/app/pages/base.php index 582c01383..cff30324a 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -2,14 +2,14 @@ namespace App\Pages; -use Zippy\Binding\PropertyBinding; -use Zippy\Html\Label; -use Zippy\Html\Panel; -use Zippy\Html\Link\ClickLink; -use App\Helper; -use App\Application as App; -use App\System; -use App\Entity\User; +use \Zippy\Binding\PropertyBinding; +use \Zippy\Html\Label; +use \Zippy\Html\Panel; +use \Zippy\Html\Link\ClickLink; +use \App\Helper; +use \App\Application as App; +use \App\System; +use \App\Entity\User; class Base extends \Zippy\Html\WebPage { diff --git a/www/app/pages/doc/goodsreceipt.php b/www/app/pages/doc/goodsreceipt.php index 499b9c696..b22a6dc7d 100644 --- a/www/app/pages/doc/goodsreceipt.php +++ b/www/app/pages/doc/goodsreceipt.php @@ -2,25 +2,25 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Customer; -use App\Entity\Doc\Document; -use App\Entity\Item; -use App\Entity\Store; -use App\Helper as H; -use App\System; -use App\Application as App; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Customer; +use \App\Entity\Doc\Document; +use \App\Entity\Item; +use \App\Entity\Store; +use \App\Helper as H; +use \App\System; +use \App\Application as App; /** * Страница ввода приходной накладной diff --git a/www/app/pages/doc/moveitem.php b/www/app/pages/doc/moveitem.php index d74c9dc79..83ca36eaf 100644 --- a/www/app/pages/doc/moveitem.php +++ b/www/app/pages/doc/moveitem.php @@ -2,24 +2,24 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; use \Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Doc\Document; -use App\Entity\Item; -use App\Entity\Stock; -use App\Entity\Store; -use App\Application as App; -use App\Helper as H; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Doc\Document; +use \App\Entity\Item; +use \App\Entity\Stock; +use \App\Entity\Store; +use \App\Application as App; +use \App\Helper as H; /** * Страница ввода перемещения товаров diff --git a/www/app/pages/doc/ordercust.php b/www/app/pages/doc/ordercust.php index f75799140..bbc2d4e8c 100644 --- a/www/app/pages/doc/ordercust.php +++ b/www/app/pages/doc/ordercust.php @@ -2,25 +2,25 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Customer; -use App\Entity\Doc\Document; -use App\Entity\Item; -use App\Entity\Store; -use App\Helper as H; -use App\System; -use App\Application as App; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Customer; +use \App\Entity\Doc\Document; +use \App\Entity\Item; +use \App\Entity\Store; +use \App\Helper as H; +use \App\System; +use \App\Application as App; /** * Страница ввода заявки поставщику diff --git a/www/app/pages/doc/prodreceipt.php b/www/app/pages/doc/prodreceipt.php index 47391a6ea..4409d1421 100644 --- a/www/app/pages/doc/prodreceipt.php +++ b/www/app/pages/doc/prodreceipt.php @@ -2,24 +2,24 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Doc\Document; -use App\Entity\Item; -use App\Entity\Store; -use App\Helper as H; -use App\System; -use App\Application as App; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Doc\Document; +use \App\Entity\Item; +use \App\Entity\Store; +use \App\Helper as H; +use \App\System; +use \App\Application as App; /** * Страница ввода оприходование с производства diff --git a/www/app/pages/doc/serviceact.php b/www/app/pages/doc/serviceact.php index ad6490fbe..95102d027 100644 --- a/www/app/pages/doc/serviceact.php +++ b/www/app/pages/doc/serviceact.php @@ -2,23 +2,23 @@ namespace App\Pages\Doc; -use App\Application as App; -use App\Entity\Customer; -use App\Entity\Doc\Document; -use App\Entity\Service; -use App\System; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextArea; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; +use \App\Application as App; +use \App\Entity\Customer; +use \App\Entity\Doc\Document; +use \App\Entity\Service; +use \App\System; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextArea; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; /** * Страница ввода акта выполненных работ diff --git a/www/app/pages/doc/serviceorder.php b/www/app/pages/doc/serviceorder.php index 068c2ed7e..e96077103 100644 --- a/www/app/pages/doc/serviceorder.php +++ b/www/app/pages/doc/serviceorder.php @@ -2,24 +2,24 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\TextArea; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Customer; -use App\Entity\Doc\Document; -use App\Entity\Service; -use App\Application as App; -use App\System; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\TextArea; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Customer; +use \App\Entity\Doc\Document; +use \App\Entity\Service; +use \App\Application as App; +use \App\System; /** * Страница ввода заказа на услуги diff --git a/www/app/pages/doc/task.php b/www/app/pages/doc/task.php index 4a7f93273..423f4adab 100644 --- a/www/app/pages/doc/task.php +++ b/www/app/pages/doc/task.php @@ -2,29 +2,29 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Customer; -use App\Entity\Doc\Document; -use App\Entity\Service; -use App\Entity\Store; -use App\Entity\Stock; -use App\Entity\Prodarea; -use App\Entity\Item; -use App\Entity\Employee; -use App\Entity\Equipment; -use App\Application as App; -use App\Helper as H; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Customer; +use \App\Entity\Doc\Document; +use \App\Entity\Service; +use \App\Entity\Store; +use \App\Entity\Stock; +use \App\Entity\Prodarea; +use \App\Entity\Item; +use \App\Entity\Employee; +use \App\Entity\Equipment; +use \App\Application as App; +use \App\Helper as H; /** * Страница ввода наряда на работу diff --git a/www/app/pages/doc/transitem.php b/www/app/pages/doc/transitem.php index 0baaafa33..0bcfe6b0d 100644 --- a/www/app/pages/doc/transitem.php +++ b/www/app/pages/doc/transitem.php @@ -2,24 +2,24 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; use \Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Doc\Document; -use App\Entity\Item; -use App\Entity\Stock; -use App\Entity\Store; -use App\Application as App; -use App\Helper as H; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Doc\Document; +use \App\Entity\Item; +use \App\Entity\Stock; +use \App\Entity\Store; +use \App\Application as App; +use \App\Helper as H; /** * Страница ввода перекомплектация товаров diff --git a/www/app/pages/doc/warranty.php b/www/app/pages/doc/warranty.php index 9ba0c56e5..7d8b173c6 100644 --- a/www/app/pages/doc/warranty.php +++ b/www/app/pages/doc/warranty.php @@ -2,23 +2,23 @@ namespace App\Pages\Doc; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Label; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\SubmitLink; -use App\Entity\Doc\Document; -use App\Entity\Item; -use App\Entity\Stock; -use App\Entity\Store; -use App\Helper as H; -use App\Application as App; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Label; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\SubmitLink; +use \App\Entity\Doc\Document; +use \App\Entity\Item; +use \App\Entity\Stock; +use \App\Entity\Store; +use \App\Helper as H; +use \App\Application as App; /** * Страница ввода гарантийного талона diff --git a/www/app/pages/import.php b/www/app/pages/import.php index 7970ea7c5..b44a949c1 100644 --- a/www/app/pages/import.php +++ b/www/app/pages/import.php @@ -2,18 +2,18 @@ namespace App\Pages; -use Zippy\Html\DataList\DataView; -use App\Entity\User; -use App\Entity\Item; -use App\Entity\Store; -use App\Entity\Category; -use App\Helper as H; -use App\System; -use Zippy\WebApplication as App; +use \Zippy\Html\DataList\DataView; +use \App\Entity\User; +use \App\Entity\Item; +use \App\Entity\Store; +use \App\Entity\Category; +use \App\Helper as H; +use \App\System; +use \Zippy\WebApplication as App; use \ZCL\DB\EntityDataSource; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; use \Zippy\Html\Form\DropDownChoice; use \Zippy\Html\Form\Form; use \Zippy\Html\Form\CheckBox; diff --git a/www/app/pages/notifylist.php b/www/app/pages/notifylist.php index e6451344b..87e262e73 100644 --- a/www/app/pages/notifylist.php +++ b/www/app/pages/notifylist.php @@ -2,14 +2,14 @@ namespace App\Pages; -use Zippy\Html\DataList\DataView; -use App\Entity\User; -use App\System; -use Zippy\WebApplication as App; +use \Zippy\Html\DataList\DataView; +use \App\Entity\User; +use \App\System; +use \Zippy\WebApplication as App; use \ZCL\DB\EntityDataSource; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; class NotifyList extends \App\Pages\Base { diff --git a/www/app/pages/options.php b/www/app/pages/options.php index b9d9db709..55c88db14 100644 --- a/www/app/pages/options.php +++ b/www/app/pages/options.php @@ -13,8 +13,8 @@ use \Zippy\Html\Label; use \Zippy\Html\Link\ClickLink; use \Zippy\Html\Panel; -use App\System; -use App\Application as App; +use \App\System; +use \App\Application as App; class Options extends \App\Pages\Base { diff --git a/www/app/pages/reference/categorylist.php b/www/app/pages/reference/categorylist.php index f09b2d4c8..7b2f3ff93 100644 --- a/www/app/pages/reference/categorylist.php +++ b/www/app/pages/reference/categorylist.php @@ -2,15 +2,15 @@ namespace App\Pages\Reference; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; -use App\Entity\Category; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; +use \App\Entity\Category; /** * справочник категорийтоваров diff --git a/www/app/pages/reference/customerlist.php b/www/app/pages/reference/customerlist.php index d33c9ed59..165aaab1b 100644 --- a/www/app/pages/reference/customerlist.php +++ b/www/app/pages/reference/customerlist.php @@ -2,24 +2,24 @@ namespace App\Pages\Reference; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\ArrayDataSource; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\TextArea; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; -use App\Helper; -use App\Entity\Customer; -use Zippy\Binding\PropertyBinding as Bind; -use App\System; -use Zippy\Html\Link\BookmarkableLink; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\ArrayDataSource; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\TextArea; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; +use \App\Helper; +use \App\Entity\Customer; +use \Zippy\Binding\PropertyBinding as Bind; +use \App\System; +use \Zippy\Html\Link\BookmarkableLink; /** * Страница контрагентов diff --git a/www/app/pages/reference/employeelist.php b/www/app/pages/reference/employeelist.php index 484986734..cd29964b2 100644 --- a/www/app/pages/reference/employeelist.php +++ b/www/app/pages/reference/employeelist.php @@ -3,19 +3,19 @@ namespace App\Pages\Reference; use ZCL\DB\EntityDataSource as EDS; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\TextArea; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; -use App\Entity\Employee; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\TextArea; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; +use \App\Entity\Employee; class EmployeeList extends \App\Pages\Base { diff --git a/www/app/pages/reference/itemlist.php b/www/app/pages/reference/itemlist.php index bda7b3f5e..ae2bfb7e3 100644 --- a/www/app/pages/reference/itemlist.php +++ b/www/app/pages/reference/itemlist.php @@ -4,7 +4,7 @@ use \Zippy\Html\DataList\DataView; use \Zippy\Html\DataList\ArrayDataSource; -use Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\AutocompleteTextInput; use \Zippy\Html\Form\DropDownChoice; use \Zippy\Html\Form\Form; use \Zippy\Html\Form\TextInput; diff --git a/www/app/pages/reference/prodarealist.php b/www/app/pages/reference/prodarealist.php index 39204ce65..fb6baae97 100644 --- a/www/app/pages/reference/prodarealist.php +++ b/www/app/pages/reference/prodarealist.php @@ -2,15 +2,15 @@ namespace App\Pages\Reference; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; -use App\Entity\ProdArea; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; +use \App\Entity\ProdArea; //роизводственные участвки class ProdAreaList extends \App\Pages\Base { diff --git a/www/app/pages/reference/servicelist.php b/www/app/pages/reference/servicelist.php index 2a7f8d194..95d6f4731 100644 --- a/www/app/pages/reference/servicelist.php +++ b/www/app/pages/reference/servicelist.php @@ -2,15 +2,15 @@ namespace App\Pages\Reference; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; -use App\Entity\Service; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; +use \App\Entity\Service; class ServiceList extends \App\Pages\Base { diff --git a/www/app/pages/reference/storelist.php b/www/app/pages/reference/storelist.php index 1df41d063..8b1ce5976 100644 --- a/www/app/pages/reference/storelist.php +++ b/www/app/pages/reference/storelist.php @@ -2,19 +2,19 @@ namespace App\Pages\Reference; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; -use Zippy\Html\Form\Button; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextArea; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; -use App\Entity\Store; -use App\Helper as H; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; +use \Zippy\Html\Form\Button; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextArea; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; +use \App\Entity\Store; +use \App\Helper as H; class StoreList extends \App\Pages\Base { diff --git a/www/app/pages/register/doclist.php b/www/app/pages/register/doclist.php index eaddf9b6b..effabe33b 100644 --- a/www/app/pages/register/doclist.php +++ b/www/app/pages/register/doclist.php @@ -2,23 +2,23 @@ namespace App\Pages\Register; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Panel; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use App\Entity\Doc\Document; -use App\Entity\Customer; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \App\Entity\Doc\Document; +use \App\Entity\Customer; use \Zippy\Html\Form\AutocompleteTextInput; -use App\Filter; -use App\Helper as H; -use App\Application as App; -use App\System; +use \App\Filter; +use \App\Helper as H; +use \App\Application as App; +use \App\System; /** * журнал докуметов diff --git a/www/app/pages/register/gilist.php b/www/app/pages/register/gilist.php index 3d19f0f4a..cc42f811d 100644 --- a/www/app/pages/register/gilist.php +++ b/www/app/pages/register/gilist.php @@ -2,23 +2,23 @@ namespace App\Pages\Register; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; use \Zippy\Html\DataList\ArrayDataSource; use \Zippy\Binding\PropertyBinding as Prop; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Panel; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use App\Entity\Doc\Document; -use App\Helper as H; -use App\Application as App; -use App\System; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \App\Entity\Doc\Document; +use \App\Helper as H; +use \App\Application as App; +use \App\System; /** * журнал продаж diff --git a/www/app/pages/register/grlist.php b/www/app/pages/register/grlist.php index 07e9f818a..9a7d3c087 100644 --- a/www/app/pages/register/grlist.php +++ b/www/app/pages/register/grlist.php @@ -2,23 +2,23 @@ namespace App\Pages\Register; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; use \Zippy\Html\DataList\ArrayDataSource; use \Zippy\Binding\PropertyBinding as Prop; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Panel; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use App\Entity\Doc\Document; -use App\Helper as H; -use App\Application as App; -use App\System; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \App\Entity\Doc\Document; +use \App\Helper as H; +use \App\Application as App; +use \App\System; /** * журнал закупок diff --git a/www/app/pages/register/ordercustlist.php b/www/app/pages/register/ordercustlist.php index 47ffd57f1..71c684dd8 100644 --- a/www/app/pages/register/ordercustlist.php +++ b/www/app/pages/register/ordercustlist.php @@ -2,23 +2,23 @@ namespace App\Pages\Register; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; use \Zippy\Html\DataList\ArrayDataSource; use \Zippy\Binding\PropertyBinding as Prop; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Panel; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use App\Entity\Doc\Document; -use App\Helper as H; -use App\Application as App; -use App\System; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \App\Entity\Doc\Document; +use \App\Helper as H; +use \App\Application as App; +use \App\System; /** * журнал заявок diff --git a/www/app/pages/register/orderlist.php b/www/app/pages/register/orderlist.php index 8830a6306..0ea54c519 100644 --- a/www/app/pages/register/orderlist.php +++ b/www/app/pages/register/orderlist.php @@ -2,19 +2,19 @@ namespace App\Pages\Register; -use App\Application as App; -use App\Entity\Doc\Document; -use App\System; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Panel; +use \App\Application as App; +use \App\Entity\Doc\Document; +use \App\System; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Panel; /** * журнал заказов diff --git a/www/app/pages/register/prodlist.php b/www/app/pages/register/prodlist.php index b6ce64bfb..5cf28a3c8 100644 --- a/www/app/pages/register/prodlist.php +++ b/www/app/pages/register/prodlist.php @@ -2,23 +2,23 @@ namespace App\Pages\Register; -use Zippy\Html\DataList\DataView; -use Zippy\Html\DataList\Paginator; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\DataList\Paginator; use \Zippy\Html\DataList\ArrayDataSource; use \Zippy\Binding\PropertyBinding as Prop; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\SubmitButton; -use Zippy\Html\Panel; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use App\Entity\Doc\Document; -use App\Helper as H; -use App\Application as App; -use App\System; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\SubmitButton; +use \Zippy\Html\Panel; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \App\Entity\Doc\Document; +use \App\Helper as H; +use \App\Application as App; +use \App\System; /** * журнал закупок diff --git a/www/app/pages/report/abc.php b/www/app/pages/report/abc.php index 31598962f..c62aef4bb 100644 --- a/www/app/pages/report/abc.php +++ b/www/app/pages/report/abc.php @@ -2,12 +2,12 @@ namespace App\Pages\Report; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Label; -use Zippy\Html\Link\RedirectLink; -use Zippy\Html\Panel; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Label; +use \Zippy\Html\Link\RedirectLink; +use \Zippy\Html\Panel; /** * АВС анализ diff --git a/www/app/pages/report/emptask.php b/www/app/pages/report/emptask.php index b43cba870..870f0b675 100644 --- a/www/app/pages/report/emptask.php +++ b/www/app/pages/report/emptask.php @@ -2,16 +2,16 @@ namespace App\Pages\Report; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\RedirectLink; -use Zippy\Html\Panel; -use App\Entity\Employee; -use App\Entity\Doc\Document; -use App\Helper as H; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\RedirectLink; +use \Zippy\Html\Panel; +use \App\Entity\Employee; +use \App\Entity\Doc\Document; +use \App\Helper as H; /** * Движение товара diff --git a/www/app/pages/report/income.php b/www/app/pages/report/income.php index 64ab97d82..db6465488 100644 --- a/www/app/pages/report/income.php +++ b/www/app/pages/report/income.php @@ -2,16 +2,16 @@ namespace App\Pages\Report; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\RedirectLink; -use Zippy\Html\Panel; -use App\Entity\Item; -use App\Entity\Store; -use App\Helper as H; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\RedirectLink; +use \Zippy\Html\Panel; +use \App\Entity\Item; +use \App\Entity\Store; +use \App\Helper as H; /** * Отчет по закупкам diff --git a/www/app/pages/report/itemactivity.php b/www/app/pages/report/itemactivity.php index b81241124..8fbbf3ca5 100644 --- a/www/app/pages/report/itemactivity.php +++ b/www/app/pages/report/itemactivity.php @@ -12,7 +12,7 @@ use \App\Entity\Item; use \App\Entity\Store; use \App\Helper as H; -use App\Application as App; +use \App\Application as App; /** * Движение товара diff --git a/www/app/pages/report/outcome.php b/www/app/pages/report/outcome.php index 1ac6185c6..8e5e0faa1 100644 --- a/www/app/pages/report/outcome.php +++ b/www/app/pages/report/outcome.php @@ -2,16 +2,16 @@ namespace App\Pages\Report; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\RedirectLink; -use Zippy\Html\Panel; -use App\Entity\Item; -use App\Entity\Store; -use App\Helper as H; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\RedirectLink; +use \Zippy\Html\Panel; +use \App\Entity\Item; +use \App\Entity\Store; +use \App\Helper as H; /** * Отчет по продажам diff --git a/www/app/pages/report/prod.php b/www/app/pages/report/prod.php index 900e9a48b..53e6c3698 100644 --- a/www/app/pages/report/prod.php +++ b/www/app/pages/report/prod.php @@ -2,16 +2,16 @@ namespace App\Pages\Report; -use Zippy\Html\Form\Date; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\RedirectLink; -use Zippy\Html\Panel; -use App\Entity\Employee; -use App\Entity\Doc\Document; -use App\Helper as H; +use \Zippy\Html\Form\Date; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\RedirectLink; +use \Zippy\Html\Panel; +use \App\Entity\Employee; +use \App\Entity\Doc\Document; +use \App\Helper as H; /** * отчет по производству diff --git a/www/app/pages/showdoc.php b/www/app/pages/showdoc.php index 01588efe4..9f678d303 100644 --- a/www/app/pages/showdoc.php +++ b/www/app/pages/showdoc.php @@ -2,7 +2,7 @@ namespace App\Pages; -use App\Entity\Doc\Document; +use \App\Entity\Doc\Document; //страница для загрузки файла экпорта class ShowDoc extends \Zippy\Html\WebPage { diff --git a/www/app/pages/userprofile.php b/www/app/pages/userprofile.php index 8189d9cdc..2c4eaa193 100644 --- a/www/app/pages/userprofile.php +++ b/www/app/pages/userprofile.php @@ -2,13 +2,13 @@ namespace App\Pages; -use Zippy\Binding\PropertyBinding as Bind; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Form\CheckBox; -use Zippy\Html\Form\DropDownChoice; -use Zippy\Html\Form\Form; -use Zippy\Html\Label; -use App\System; +use \Zippy\Binding\PropertyBinding as Bind; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\CheckBox; +use \Zippy\Html\Form\DropDownChoice; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Label; +use \App\System; use \Zippy\Html\DataList\DataView; class UserProfile extends \App\Pages\Base { diff --git a/www/app/widgets/docview.php b/www/app/widgets/docview.php index c5f90df17..2f03b4de5 100644 --- a/www/app/widgets/docview.php +++ b/www/app/widgets/docview.php @@ -2,20 +2,20 @@ namespace App\Widgets; -use Zippy\Binding\PropertyBinding as Prop; -use Zippy\Html\DataList\ArrayDataSource; -use Zippy\Html\DataList\DataView; -use Zippy\Html\Form\AutocompleteTextInput; -use Zippy\Html\Form\Form; -use Zippy\Html\Form\TextArea; -use Zippy\Html\Form\TextInput; -use Zippy\Html\Label; -use Zippy\Html\Link\ClickLink; -use Zippy\Html\Link\RedirectLink; -use App\Entity\Doc\Document; -use App\Helper; -use App\Application as App; -use App\System; +use \Zippy\Binding\PropertyBinding as Prop; +use \Zippy\Html\DataList\ArrayDataSource; +use \Zippy\Html\DataList\DataView; +use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\Form; +use \Zippy\Html\Form\TextArea; +use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Label; +use \Zippy\Html\Link\ClickLink; +use \Zippy\Html\Link\RedirectLink; +use \App\Entity\Doc\Document; +use \App\Helper; +use \App\Application as App; +use \App\System; /** * Виджет для просмотра документов From 48d73f0a16c40fa280f5e27c506215f585ee0a84 Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 11 Jun 2019 17:56:16 +0300 Subject: [PATCH 09/17] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B0=D0=BD=20=D0=BB=D0=BE=D0=B3=20=D0=B4=D0=BE=D0=BA?= =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/doc/document.php | 147 ++++++++++++------------ www/app/pages/main.php | 2 + www/app/pages/register/doclist.php | 14 ++- www/app/pages/users.php | 4 + www/app/widgets/docview.php | 4 +- www/app/widgets/wplanneddocs.php | 11 +- www/app/widgets/wrdoc.php | 64 +++++++++++ www/templates/pages/main.html | 6 +- www/templates/pages/users.html | 4 + www/templates/widgets/wplanneddocs.html | 4 +- www/templates/widgets/wrdoc.html | 21 ++++ 11 files changed, 192 insertions(+), 89 deletions(-) create mode 100644 www/app/widgets/wrdoc.php create mode 100644 www/templates/widgets/wrdoc.html diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index 6974ee872..cec8d95d8 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -50,12 +50,8 @@ class Document extends \ZCL\DB\Entity { */ public $detaildata = array(); - /** - * массив статусов - * - * @var mixed - */ - private $logdata = array(); + + protected function init() { $this->document_id = 0; @@ -149,19 +145,8 @@ private function packData() { $this->content .= ""; } - $this->content .= " "; - $this->content .= " "; - foreach ($this->logdata as $state) { - $this->content .= ""; - $this->content .= "{$state->state}"; - $this->content .= "{$state->user}"; - $this->content .= "username}]]>"; - $this->content .= "{$state->hostname}"; - $this->content .= "{$state->updatedon}"; - - $this->content .= ""; - } - $this->content .= ""; + $this->content .= " "; + } /** @@ -193,20 +178,7 @@ private function unpackData() { } $this->detaildata[] = $_row; } - $this->logdata = array(); - $result = $xml->xpath('//states'); - - if ((bool) (count($result))) { - foreach ($xml->states->children() as $row) { - $state = new \App\DataItem(); - $state->state = (int) $row->stateno; - $state->hostname = (string) $row->statehost; - $state->user = (int) $row->stateuser; - $state->username = (string) $row->stateusername; - $state->updatedon = (int) $row->statedt; - $this->logdata[] = $state; - } - } + } /** @@ -281,13 +253,8 @@ public function cast() { return $doc; } - protected function beforeDelete() { - - return true; - } - protected function afterSave($update) { // if ($update == false) { //новый документ @@ -501,35 +468,51 @@ public static function search($type, $from, $to, $header = array()) { return Document::find($where); } + /** - * может быть удален - * - */ - public function canDeleted() { + * @see \ZDB\Entity + * + */ + protected function beforeDelete() { + $conn = \ZDB\DB::getConnect(); $cnt = $conn->GetOne("select count(*) from entrylist where document_id = {$this->document_id} "); if ($cnt > 0) { - System::setErrorMsg("У докуинта есть записи в аналитике"); - return false; + + return "У документа есть записи в аналитике"; } $cnt = $conn->GetOne("select count(*) from docrel where doc1 = {$this->document_id} or doc2 = {$this->document_id}"); if ($cnt > 0) { - System::setErrorMsg("Есть связаные документы"); - return false; + + return "Есть связаные документы, удалите связи"; } $f = $this->checkStates(array(Document::STATE_PAYED, Document::STATE_PART_PAYED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); if ($f) { - System::setErrorMsg("У документа были оплаты или доставки"); - return false; + + return "У документа были оплаты или доставки"; } - return true; + return ""; } + /** + * @see \ZDB\Entity + * + */ + protected function afterDelete() { + + $conn = \ZDB\DB::getConnect(); + $conn->Execute("delete from docstatelog where document_id=".$this->document_id); + $conn->Execute("delete from paylist where document_id=".$this->document_id); + + + } + + /** * может быть отменен @@ -572,17 +555,12 @@ public function getPayments() { * @param mixed $state */ public function insertLog($state) { - - $host = Document::qstr($_SERVER["REMOTE_ADDR"]); + $conn = \ZDB\DB::getConnect(); + $host = $conn->qstr($_SERVER["REMOTE_ADDR"]); $user = \App\System::getUser(); - - $item = new \App\DataItem(); - $item->state = $state; - $item->hostname = $host; - $item->user = $user->user_id; - $item->username = $user->username; - $item->updatedon = time(); - $this->logdata[] = $item; + + $sql="insert into docstatelog (document_id,user_id,createdon,docstate,hostname) values({$this->document_id},{$user->user_id},now(),{$state},{$host})"; + $conn->Execute($sql); } /** @@ -590,10 +568,15 @@ public function insertLog($state) { * */ public function getLogList() { - - - - return $this->logdata; + $conn = \ZDB\DB::getConnect(); + $rc = $conn->Execute("select * from docstatelog_view where document_id={$this->document_id} order by log_id"); + $states = array(); + foreach($rc as $row){ + $row['createdon']=strtotime($row['createdon']); + $states[] = new \App\DataItem($row); + } + + return $states; } /** @@ -602,17 +585,35 @@ public function getLogList() { * @param mixed $states */ public function checkStates(array $states) { + if(count($states)==0) return false; + $conn = \ZDB\DB::getConnect(); + $states = implode(',',$states) ; + + $cnt = $conn->getOne("select count(*) from docstatelog where docstate in({$states}) and document_id={$this->document_id}"); + return $cnt > 0; + } - - - foreach ($this->logdata as $srow) { - foreach ($states as $state) { - if ($srow->state == $state) - return true; - } - } - - return false; + /** + * платеж от покупателя + * + * @param mixed $user + * @param mixed $amount + * @param mixed $mf + * @param mixed $comment + */ + public function addPaymentIncome($user, $amount, $mf,$comment = '') { + + } + /** + * расходный платеж + * + * @param mixed $user + * @param mixed $amount + * @param mixed $mf + * @param mixed $comment + */ + public function addPaymentOutcome($user, $amount, $mf,$comment = '') { + } } diff --git a/www/app/pages/main.php b/www/app/pages/main.php index f71798a69..8e3c4ca1a 100644 --- a/www/app/pages/main.php +++ b/www/app/pages/main.php @@ -22,6 +22,8 @@ public function __construct() { $this->add(new \App\Widgets\WMinQty("wminqty")); $this->add(new \App\Widgets\Wsdate("wsdate"))->setVisible($this->_tvars["usesnumber"]); + + $this->add(new \App\Widgets\WRDoc("wrdoc")); } public function getPageInfo() { diff --git a/www/app/pages/register/doclist.php b/www/app/pages/register/doclist.php index effabe33b..0e1c1a1d2 100644 --- a/www/app/pages/register/doclist.php +++ b/www/app/pages/register/doclist.php @@ -71,8 +71,11 @@ public function __construct($docid = 0) { $this->add(new \App\Widgets\DocView('docview'))->setVisible(false); if ($docid > 0) { $this->docview->setVisible(true); - $this->docview->setDoc(Document::load($docid)); + $dc=Document::load($docid); + $this->docview->setDoc($dc); //$this->doclist->setSelectedRow($docid); + $filter->searchnumber = $dc->document_number; + $this->filter->searchnumber->setText($dc->document_number) ; $doclist->Reload(); } @@ -194,13 +197,12 @@ public function deleteOnClick($sender) { $doc = $sender->owner->getDataItem(); if (false == \App\ACL::checkEditDoc($doc, true)) return; - - $doc = $doc->cast(); - if ($doc->canDeleted() == false) { - + + $del=Document::delete($doc->document_id); + if(strlen($del) > 0){ + $this->setError($del); return; } - Document::delete($doc->document_id); $this->doclist->Reload(true); $this->resetURL(); } diff --git a/www/app/pages/users.php b/www/app/pages/users.php index bbcce28bf..b353b5b4e 100644 --- a/www/app/pages/users.php +++ b/www/app/pages/users.php @@ -102,6 +102,8 @@ public function onEdit($sender) { $this->editpan->editform->editwminqty->setChecked(true); if (strpos($this->user->widgets, 'wsdate') !== false) $this->editpan->editform->editwsdate->setChecked(true); + if (strpos($this->user->widgets, 'wrdoc') !== false) + $this->editpan->editform->editwrdoc->setChecked(true); if (strpos($this->user->modules, 'ocstore') !== false) $this->editpan->editform->editocstore->setChecked(true); @@ -171,6 +173,8 @@ public function saveOnClick($sender) { $widgets = $widgets . ',wminqty'; if ($this->editpan->editform->editwsdate->isChecked()) $widgets = $widgets . ',wsdate'; + if ($this->editpan->editform->editwrdoc->isChecked()) + $widgets = $widgets . ',wrdoc'; $this->user->widgets = trim($widgets, ','); diff --git a/www/app/widgets/docview.php b/www/app/widgets/docview.php index 2f03b4de5..cd5228075 100644 --- a/www/app/widgets/docview.php +++ b/www/app/widgets/docview.php @@ -138,9 +138,9 @@ public function detailDocOnClick($sender) { public function stateListOnRow($row) { $item = $row->getDataItem(); $row->add(new Label('statehost', $item->hostname)); - $row->add(new Label('statedate', date('Y.m.d H:i', $item->updatedon))); + $row->add(new Label('statedate', date('Y.m.d H:i', $item->createdon))); $row->add(new Label('stateuser', $item->username)); - $row->add(new Label('statename', Document::getStateName($item->state))); + $row->add(new Label('statename', Document::getStateName($item->docstate))); } //вывод строки оплат diff --git a/www/app/widgets/wplanneddocs.php b/www/app/widgets/wplanneddocs.php index 95eec6d6a..b149fb543 100644 --- a/www/app/widgets/wplanneddocs.php +++ b/www/app/widgets/wplanneddocs.php @@ -29,7 +29,7 @@ public function __construct($id) { // список запланированных документов $where = "state not in( " . Document::STATE_CANCELED . "," . Document::STATE_EDITED . "," . Document::STATE_NEW . ") "; $where = $where . " and document_date >= " . $conn->DBDate(strtotime('-5 days')); - $where = $where . " and meta_name in ('ServiceAct','GoodsIssue','GoodsReceipt') "; + // $where = $where . " and meta_name in ('ServiceAct','GoodsIssue','GoodsReceipt') "; $where = $where . " and content like '%1%'"; if ($visible) { $data = Document::find($where, "document_date desc"); @@ -49,7 +49,8 @@ public function doclistOnRow($row) { $item = $row->getDataItem(); $item = $item->cast(); $dt = date('d-m-Y', $item->document_date); - $row->add(new Label('number', $item->document_number)); + $row->add(new \Zippy\Html\Link\RedirectLink("number","\\App\\Pages\\Register\\DocList",$item->document_id))->setValue($item->document_number); + $row->add(new Label('date', $dt)); $row->add(new Label('type', $item->meta_desc)); @@ -59,12 +60,12 @@ public function doclistOnRow($row) { $end = $date->endOfDay()->timestamp; if (time() < $start) { - $row->number->setAttribute('class', 'badge '); + $row->date->setAttribute('class', 'badge '); } else if (time() > $end) { - $row->number->setAttribute('class', 'badge badge-danger'); + $row->date->setAttribute('class', 'badge badge-danger'); } else { - $row->number->setAttribute('class', 'badge badge-warning'); + $row->date->setAttribute('class', 'badge badge-warning'); } } diff --git a/www/app/widgets/wrdoc.php b/www/app/widgets/wrdoc.php new file mode 100644 index 000000000..acbeac810 --- /dev/null +++ b/www/app/widgets/wrdoc.php @@ -0,0 +1,64 @@ +widgets, 'wrdoc') !== false || System::getUser()->userlogin == 'admin'); + + $conn = $conn = \ZDB\DB::getConnect(); + $data = array(); + + if ($visible) { + $sql="select distinct document_id,meta_desc,document_number from docstatelog_view where user_id={$user->user_id} and createdon > ". $conn->DBDate(strtotime("-1 month",time())) ." order by log_id"; + + + $rc = $conn->Execute($sql); + + foreach($rc as $row){ + $data[] = new \App\DataItem($row) ; + + } + } + + $doclist = $this->add(new DataView('rdoclist', new ArrayDataSource($data), $this, 'doclistOnRow')); + + + $doclist->Reload(); + + if (count($data) == 0 || $visible == false) { + $this->setVisible(false); + }; + } + + public function doclistOnRow($row) { + $item = $row->getDataItem(); + + + + + $row->add(new Label('type', $item->meta_desc)); + $row->add(new \Zippy\Html\Link\RedirectLink("number","\\App\\Pages\\Register\\DocList",$item->document_id))->setValue($item->document_number); + + + + } + +} diff --git a/www/templates/pages/main.html b/www/templates/pages/main.html index bf80d27c8..6ada107d7 100644 --- a/www/templates/pages/main.html +++ b/www/templates/pages/main.html @@ -3,7 +3,11 @@
    - {{#usesnumber}} +
    + +
    +
    + {{#usesnumber}}
    diff --git a/www/templates/pages/users.html b/www/templates/pages/users.html index 3848c22b1..d46d5037b 100644 --- a/www/templates/pages/users.html +++ b/www/templates/pages/users.html @@ -85,6 +85,10 @@

    Редактирование пользователя

    {{/usesnumber}} +
    + + +
    diff --git a/www/templates/widgets/wplanneddocs.html b/www/templates/widgets/wplanneddocs.html index 276e06111..e9c04aad5 100644 --- a/www/templates/widgets/wplanneddocs.html +++ b/www/templates/widgets/wplanneddocs.html @@ -10,9 +10,9 @@

    Запланированные документы

    Дата - + - +
    diff --git a/www/templates/widgets/wrdoc.html b/www/templates/widgets/wrdoc.html new file mode 100644 index 000000000..2368ded4e --- /dev/null +++ b/www/templates/widgets/wrdoc.html @@ -0,0 +1,21 @@ + + + +
    +

    Недавние документы

    + + + + + + + + + + + +
    НомерТип
    + +
    + + From f58d93e1a2df09f27ec89d101670f5c45849851b Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 12 Jun 2019 00:43:34 +0300 Subject: [PATCH 10/17] pay --- www/app/entity/doc/document.php | 36 ++++---- www/app/entity/moneyfund.php | 24 ++++++ www/app/entity/pay.php | 6 +- www/app/pages/reference/mflist.php | 84 +++++++++++-------- www/app/pages/report/itemactivity.php | 21 +++-- www/app/widgets/docview.php | 6 +- .../pages/reference/categorylist.html | 3 +- www/templates/pages/reference/mflist.html | 32 ++++--- www/templates/pages/report/itemactivity.html | 3 + www/templates/widgets/docview.html | 2 +- 10 files changed, 139 insertions(+), 78 deletions(-) diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index cec8d95d8..6c86d1eee 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -5,6 +5,7 @@ use \App\System; use \App\Helper; + /** * Класс-сущность документ * @@ -490,7 +491,6 @@ protected function beforeDelete() { return "Есть связаные документы, удалите связи"; } - $f = $this->checkStates(array(Document::STATE_PAYED, Document::STATE_PART_PAYED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); if ($f) { @@ -508,10 +508,8 @@ protected function afterDelete() { $conn = \ZDB\DB::getConnect(); $conn->Execute("delete from docstatelog where document_id=".$this->document_id); $conn->Execute("delete from paylist where document_id=".$this->document_id); - } - /** @@ -540,15 +538,7 @@ public function addPayment($user, $amount, $comment = '') { $this->headerdata['pays'] = base64_encode(serialize($list)); } - //возвращает список оплат - public function getPayments() { - if (strlen($this->headerdata['pays']) > 0) { - return @unserialize(base64_decode($this->headerdata['pays'])); - } - - return array(); - } - + /** * * запись состояния в лог документа @@ -601,9 +591,17 @@ public function checkStates(array $states) { * @param mixed $mf * @param mixed $comment */ - public function addPaymentIncome($user, $amount, $mf,$comment = '') { - + public function addPaymentIncome( $amount, $mf,$comment = '') { + $pay = new \App\Pay(); + $pay->mf_id = $mf; + $pay->document_id = $this->document_id; + $pay->amount = $amount; + $pay->notes = $comment; + + $pay->user_id = System::getUser()->user_id; + $pay->save(); } + /** * расходный платеж * @@ -613,7 +611,15 @@ public function addPaymentIncome($user, $amount, $mf,$comment = '') { * @param mixed $comment */ public function addPaymentOutcome($user, $amount, $mf,$comment = '') { - + $this->addPaymentIncome($user, 0-$amount, $mf,$comment); } + //возвращает список оплат + public function getPayments() { + $list = \App\Pay::find("document_id=".$this->document_id,"mf_id"); + + return $list; + } + + } diff --git a/www/app/entity/moneyfund.php b/www/app/entity/moneyfund.php index b9c1a75be..bcf313f8b 100644 --- a/www/app/entity/moneyfund.php +++ b/www/app/entity/moneyfund.php @@ -13,5 +13,29 @@ class MoneyFund extends \ZCL\DB\Entity { protected function init() { $this->mf_id = 0; } + + protected function beforeDelete() { + + $conn = \ZDB\DB::getConnect(); + $cnt = $conn->GetOne("select count(*) from paylist where mf_id = {$this->mf_id} "); + if ($cnt > 0) { + return "Нельзя удалять счет с оплатами"; + } + return ""; + } + + public static function Balance() { + + $conn = \ZDB\DB::getConnect(); + $list = array(); + $rc = $conn->Execute("select coalesce(sum(amount),0) as amount,mf_id from paylist group by mf_id "); + foreach($rc as $row){ + $list[$row["mf_id"]] = $row["amount"] ; + } + return $list; + } + + + } diff --git a/www/app/entity/pay.php b/www/app/entity/pay.php index 4b737f748..6be1f3fad 100644 --- a/www/app/entity/pay.php +++ b/www/app/entity/pay.php @@ -13,6 +13,10 @@ class Pay extends \ZCL\DB\Entity { protected function init() { $this->pl_id = 0; + $this->paydate = time(); + } + protected function afterLoad() { + $this->paydate = strtotime($this->paydate); + } - } \ No newline at end of file diff --git a/www/app/pages/reference/mflist.php b/www/app/pages/reference/mflist.php index 2bdb33d3d..14acb66b3 100644 --- a/www/app/pages/reference/mflist.php +++ b/www/app/pages/reference/mflist.php @@ -7,10 +7,11 @@ use \Zippy\Html\Form\Form; use \Zippy\Html\Form\SubmitButton; use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\TextArea; use \Zippy\Html\Label; use \Zippy\Html\Link\ClickLink; use \Zippy\Html\Panel; -use \App\Entity\Category; +use \App\Entity\MoneyFund; /** @@ -18,80 +19,89 @@ */ class MFList extends \App\Pages\Base { - private $_category; + private $_mf; + private $_balance ; public function __construct() { parent::__construct(); - if (false == \App\ACL::checkShowRef('CategoryList')) + if (false == \App\ACL::checkShowRef('MFList')) return; - $this->add(new Panel('categorytable'))->setVisible(true); - $this->categorytable->add(new DataView('categorylist', new \ZCL\DB\EntityDataSource('\App\Entity\Category'), $this, 'categorylistOnRow'))->Reload(); - $this->categorytable->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); - $this->add(new Form('categorydetail'))->setVisible(false); - $this->categorydetail->add(new TextInput('editcat_name')); - $this->categorydetail->add(new SubmitButton('save'))->onClick($this, 'saveOnClick'); - $this->categorydetail->add(new Button('cancel'))->onClick($this, 'cancelOnClick'); + $this->add(new Panel('mftable'))->setVisible(true); + $this->mftable->add(new DataView('mflist', new \ZCL\DB\EntityDataSource('\App\Entity\MoneyFund'), $this, 'mflistOnRow'))->Reload(); + $this->mftable->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); + $this->add(new Form('mfdetail'))->setVisible(false); + $this->mfdetail->add(new TextInput('editmf_name')); + $this->mfdetail->add(new TextArea('editmf_description')); + $this->mfdetail->add(new SubmitButton('save'))->onClick($this, 'saveOnClick'); + $this->mfdetail->add(new Button('cancel'))->onClick($this, 'cancelOnClick'); + + $this->_balance = MoneyFund::Balance(); + } - public function categorylistOnRow($row) { + public function mflistOnRow($row) { $item = $row->getDataItem(); - $row->add(new Label('cat_name', $item->cat_name)); + $row->add(new Label('mf_name', $item->mf_name)); + $row->add(new Label('description', $item->description)); + $row->add(new Label('amount', $this->_balance[$item->mf_id])); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); } public function deleteOnClick($sender) { - if (false == \App\ACL::checkEditRef('CategoryList')) + if (false == \App\ACL::checkEditRef('MFList')) return; - $cat_id = $sender->owner->getDataItem()->cat_id; - $cnt = \App\Entity\Item::findCnt(" disabled <> 1 and cat_id=" . $cat_id); - if ($cnt > 0) { - $this->setError('Нельзя удалить категорию с товарами'); + $mf_id = $sender->owner->getDataItem()->mf_id; + + $rc = MoneyFund::delete($mf_id); + if(strlen($rc) > 0){ + $this->setError($rc) ; return; - } - Category::delete($cat_id); - $this->categorytable->categorylist->Reload(); + } + $this->mftable->mflist->Reload(); } public function editOnClick($sender) { - $this->_category = $sender->owner->getDataItem(); - $this->categorytable->setVisible(false); - $this->categorydetail->setVisible(true); - $this->categorydetail->editcat_name->setText($this->_category->cat_name); + $this->_mf = $sender->owner->getDataItem(); + $this->mftable->setVisible(false); + $this->mfdetail->setVisible(true); + $this->mfdetail->editmf_name->setText($this->_mf->mf_name); + $this->mfdetail->editmf_description->setText($this->_mf->mf_description); } public function addOnClick($sender) { - $this->categorytable->setVisible(false); - $this->categorydetail->setVisible(true); + $this->mftable->setVisible(false); + $this->mfdetail->setVisible(true); // Очищаем форму - $this->categorydetail->clean(); + $this->mfdetail->clean(); - $this->_category = new Category(); + $this->_mf = new MoneyFund(); } public function saveOnClick($sender) { - if (false == \App\ACL::checkEditRef('CategoryList')) + if (false == \App\ACL::checkEditRef('MFList')) return; - $this->_category->cat_name = $this->categorydetail->editcat_name->getText(); - if ($this->_category->cat_name == '') { + $this->_mf->mf_name = $this->mfdetail->editmf_name->getText(); + $this->_mf->description = $this->mfdetail->editmf_description->getText(); + if ($this->_mf->mf_name == '') { $this->setError("Введите наименование"); return; } - $this->_category->Save(); - $this->categorydetail->setVisible(false); - $this->categorytable->setVisible(true); - $this->categorytable->categorylist->Reload(); + $this->_mf->Save(); + $this->mfdetail->setVisible(false); + $this->mftable->setVisible(true); + $this->mftable->mflist->Reload(); } public function cancelOnClick($sender) { - $this->categorytable->setVisible(true); - $this->categorydetail->setVisible(false); + $this->mftable->setVisible(true); + $this->mfdetail->setVisible(false); } } diff --git a/www/app/pages/report/itemactivity.php b/www/app/pages/report/itemactivity.php index 8fbbf3ca5..82d0b6b66 100644 --- a/www/app/pages/report/itemactivity.php +++ b/www/app/pages/report/itemactivity.php @@ -6,11 +6,13 @@ use \Zippy\Html\Form\DropDownChoice; use \Zippy\Html\Form\Form; use \Zippy\Html\Form\AutocompleteTextInput; +use \Zippy\Html\Form\TextInput; use \Zippy\Html\Label; use \Zippy\Html\Link\RedirectLink; use \Zippy\Html\Panel; use \App\Entity\Item; use \App\Entity\Store; +use \App\Entity\Stock; use \App\Helper as H; use \App\Application as App; @@ -27,9 +29,9 @@ public function __construct() { $this->add(new Form('filter'))->onSubmit($this, 'OnSubmit'); $this->filter->add(new Date('from', time() - (7 * 24 * 3600))); $this->filter->add(new Date('to', time())); + $this->filter->add(new TextInput('snumber'))->setVisible(false); $this->filter->add(new DropDownChoice('store', Store::getList(), H::getDefStore())); - $this->filter->add(new AutocompleteTextInput('item'))->onText($this, 'OnAutoItem'); $this->add(new \Zippy\Html\Link\ClickLink('autoclick'))->onClick($this, 'OnAutoLoad', true); @@ -90,14 +92,19 @@ private function generateReport() { $storeid = $this->filter->store->getValue(); $itemid = $this->filter->item->getKey(); - - $it = $itemid > 0 ? "st.item_id=" . $itemid : "1=1"; + $snumber= $this->filter->snumber->getText(); + + $it = "1=1"; + if($itemid > 0 ){ + $it .= " and st.item_id=" . $itemid ; + } + if(strlen($snumber) > 0 ){ + $it .= " and st.snumber=" . Stock::qstr($snumber) ; + } + $from = $this->filter->from->getDate(); $to = $this->filter->to->getDate(); - - - - + $i = 1; $detail = array(); $conn = \ZDB\DB::getConnect(); diff --git a/www/app/widgets/docview.php b/www/app/widgets/docview.php index cd5228075..ffdb4f635 100644 --- a/www/app/widgets/docview.php +++ b/www/app/widgets/docview.php @@ -146,10 +146,10 @@ public function stateListOnRow($row) { //вывод строки оплат public function payListOnRow($row) { $item = $row->getDataItem(); - $row->add(new Label('paydate', date('Y-m-d', $item->date))); + $row->add(new Label('paydate', date('Y-m-d', $item->paydate))); $row->add(new Label('payamount', $item->amount)); - $row->add(new Label('payuser', $item->user)); - $row->add(new Label('paycomment', $item->comment)); + $row->add(new Label('payuser', $item->username)); + $row->add(new Label('paycomment', $item->notes)); } /** diff --git a/www/templates/pages/reference/categorylist.html b/www/templates/pages/reference/categorylist.html index c3c25252f..64115d719 100644 --- a/www/templates/pages/reference/categorylist.html +++ b/www/templates/pages/reference/categorylist.html @@ -8,7 +8,7 @@

    Категории товаров

    Добавить - +
    @@ -17,7 +17,6 @@

    Категории товаров

    - diff --git a/www/templates/pages/reference/mflist.html b/www/templates/pages/reference/mflist.html index fc8b2767a..46e1ce00d 100644 --- a/www/templates/pages/reference/mflist.html +++ b/www/templates/pages/reference/mflist.html @@ -5,21 +5,25 @@
    -
    +

    Денежные счета

    Добавить -
    Название
    +
    + + - + - - - - - + + + + + +
    НазваниеОписаниеБаланс
    + +
    @@ -32,10 +36,14 @@

    Денежные счета

    -
    + +
    + + +
    - - + +
    diff --git a/www/templates/pages/report/itemactivity.html b/www/templates/pages/report/itemactivity.html index 9b67c1788..df8f15298 100644 --- a/www/templates/pages/report/itemactivity.html +++ b/www/templates/pages/report/itemactivity.html @@ -20,6 +20,9 @@

    Движение по складу

    + + + diff --git a/www/templates/widgets/docview.html b/www/templates/widgets/docview.html index 2bc7a6a72..f13648a2c 100644 --- a/www/templates/widgets/docview.html +++ b/www/templates/widgets/docview.html @@ -9,7 +9,7 @@
  • Форма для печати
  • Коментарии
  • Прикрепленные файлы, документы
    • -
  • История изменений
    • +
  • История изменений
    • From 5b8f782bcf7e6bb3f958032c1aa05a09968e415c Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 12 Jun 2019 18:09:08 +0300 Subject: [PATCH 11/17] pay --- www/app/entity/doc/document.php | 76 ++++++++++++----------------- www/app/entity/doc/goodsreceipt.php | 4 +- www/app/entity/doc/ordercust.php | 2 +- www/app/entity/doc/prodissue.php | 4 +- www/app/entity/doc/prodreceipt.php | 4 +- www/app/entity/doc/returnissue.php | 4 +- www/app/entity/pay.php | 1 + www/app/modules/ocstore/orders.php | 1 - www/app/pages/doc/goodsissue.php | 32 ++++++------ www/app/pages/doc/goodsreceipt.php | 17 ++++--- www/app/pages/doc/moveitem.php | 12 ++--- www/app/pages/doc/order.php | 2 +- www/app/pages/doc/ordercust.php | 7 +-- www/app/pages/doc/prodissue.php | 16 +++--- www/app/pages/doc/prodreceipt.php | 18 +++---- www/app/pages/doc/retcustissue.php | 6 +-- www/app/pages/doc/returnissue.php | 7 ++- www/app/pages/doc/serviceact.php | 14 +++--- www/app/pages/doc/serviceorder.php | 6 +-- www/app/pages/doc/task.php | 22 ++++----- www/app/pages/doc/transitem.php | 15 +++--- www/app/pages/doc/warranty.php | 10 ++-- www/app/pages/import.php | 2 +- 23 files changed, 130 insertions(+), 152 deletions(-) diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index 6c86d1eee..01ffb1c51 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -51,9 +51,10 @@ class Document extends \ZCL\DB\Entity { */ public $detaildata = array(); - - - + /** + * начальная инициализация. Вызывается автоматически в конструкторе Entity + * + */ protected function init() { $this->document_id = 0; $this->state = 0; @@ -67,11 +68,15 @@ protected function init() { $this->basedoc = ''; $this->headerdata = array(); - $this->headerdata['incredit'] = 0; //оплата в долг - $this->headerdata['inshipment'] = 0; //товары в пути + + // $this->headerdata['inshipment'] = 0; //товары в пути $this->headerdata['planned'] = 0; //запланированный } + /** + * возвращает метаданные чтобы работало в дочерних классах + * + */ protected static function getMetadata() { return array('table' => 'documents', 'view' => 'documents_view', 'keyfield' => 'document_id'); } @@ -213,11 +218,10 @@ protected function Cancel() { $conn->Execute("delete from entrylist where document_id =" . $this->document_id); //удаляем освободившиеся стоки $conn->Execute("delete from store_stock where stock_id not in (select stock_id from entrylist) "); + $conn->CompleteTrans(); - - - + return true; } @@ -255,7 +259,6 @@ public function cast() { } - protected function afterSave($update) { // if ($update == false) { //новый документ @@ -517,28 +520,14 @@ protected function afterDelete() { * */ public function canCanceled() { - $f = $this->checkStates(array(Document::STATE_CLOSED, Document::STATE_PART_PAYED, Document::STATE_PART_PAYED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); + $f = $this->checkStates(array(Document::STATE_CLOSED, Document::STATE_PAYED, Document::STATE_PART_PAYED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); if ($f) { System::setWarnMsg("У документа были оплаты или доставки"); return true; } return true; } - - //добавляет оплату - public function addPayment($user, $amount, $comment = '') { - $list = $this->getPayments(); - $item = new \App\DataItem(); - $item->user = $user; - $item->amount = $amount; - $item->comment = $comment; - $item->date = time(); - $list[] = $item; - - $this->headerdata['pays'] = base64_encode(serialize($list)); - } - - + /** * * запись состояния в лог документа @@ -584,15 +573,15 @@ public function checkStates(array $states) { } /** - * платеж от покупателя + * Добавляет платеж * - * @param mixed $user - * @param mixed $amount - * @param mixed $mf - * @param mixed $comment + * @param mixed $amount сумма + * @param mixed $mf денежный счет + * @param mixed $comment коментарий */ - public function addPaymentIncome( $amount, $mf,$comment = '') { - $pay = new \App\Pay(); + public function addPayment( $amount, $mf,$comment = '') { + if(0==(int)$amount || 0==(int)$this->document_id || 0== $mf) return; + $pay = new \App\Entity\Pay(); $pay->mf_id = $mf; $pay->document_id = $this->document_id; $pay->amount = $amount; @@ -602,24 +591,23 @@ public function addPaymentIncome( $amount, $mf,$comment = '') { $pay->save(); } - /** - * расходный платеж - * - * @param mixed $user - * @param mixed $amount - * @param mixed $mf - * @param mixed $comment - */ - public function addPaymentOutcome($user, $amount, $mf,$comment = '') { - $this->addPaymentIncome($user, 0-$amount, $mf,$comment); - } + //возвращает список оплат public function getPayments() { - $list = \App\Pay::find("document_id=".$this->document_id,"mf_id"); + $list = \App\Entity\Pay::find("document_id=".$this->document_id,"mf_id"); return $list; } + //возвращает сумму оплат по документу + public function getPaymentAmount() { + $conn = \ZDB\DB::getConnect(); + + $sql="select coalesce(sum(amount),0) from paylist where document_id=".$this->document_id; + return $conn->GetOne($sql); + + } + } diff --git a/www/app/entity/doc/goodsreceipt.php b/www/app/entity/doc/goodsreceipt.php index d33609c0c..342991b93 100644 --- a/www/app/entity/doc/goodsreceipt.php +++ b/www/app/entity/doc/goodsreceipt.php @@ -38,7 +38,7 @@ public function generateReport() { "_detail" => $detail, "customer_name" => $this->customer_name, "document_number" => $this->document_number, - "total" => $this->headerdata["total"] + "total" => $this->amount ); @@ -76,7 +76,7 @@ public function Execute() { } } - //$total = $this->headerdata['total']; + return true; } diff --git a/www/app/entity/doc/ordercust.php b/www/app/entity/doc/ordercust.php index 62cdc5d0c..19bf6fac4 100644 --- a/www/app/entity/doc/ordercust.php +++ b/www/app/entity/doc/ordercust.php @@ -32,7 +32,7 @@ public function generateReport() { "_detail" => $detail, "customer_name" => $this->customer_name, "document_number" => $this->document_number, - "total" => $this->headerdata["total"] + "total" => $this->amount ); diff --git a/www/app/entity/doc/prodissue.php b/www/app/entity/doc/prodissue.php index dc1c32fca..a34498bda 100644 --- a/www/app/entity/doc/prodissue.php +++ b/www/app/entity/doc/prodissue.php @@ -48,9 +48,9 @@ public function generateReport() { "firmname" => $firm['firmname'], "pareaname" => $this->headerdata["pareaname"], "document_number" => $this->document_number, - "total" => $this->headerdata["total"], + "total" => amount, "notes" => $this->notes, - "summa" => Util::ucfirst(Util::money2str($this->headerdata["total"])) + "summa" => Util::ucfirst(Util::money2str(amount)) ); $report = new \App\Report('prodissue.tpl'); diff --git a/www/app/entity/doc/prodreceipt.php b/www/app/entity/doc/prodreceipt.php index 43cafda39..73d815861 100644 --- a/www/app/entity/doc/prodreceipt.php +++ b/www/app/entity/doc/prodreceipt.php @@ -40,7 +40,7 @@ public function generateReport() { "document_number" => $this->document_number, "pareaname" => $this->headerdata["pareaname"], "notes" => $this->notes, - "total" => $this->headerdata["total"] + "total" => $this->amount ); @@ -65,7 +65,7 @@ public function Execute() { $sc->save(); } - //$total = $this->headerdata['total']; + return true; } diff --git a/www/app/entity/doc/returnissue.php b/www/app/entity/doc/returnissue.php index 48da5d5a3..42592ab2c 100644 --- a/www/app/entity/doc/returnissue.php +++ b/www/app/entity/doc/returnissue.php @@ -46,8 +46,8 @@ public function generateReport() { "firmname" => $firm['firmname'], "customername" => $this->customer_name, "document_number" => $this->document_number, - "total" => $this->headerdata["total"], - "summa" => Util::ucfirst(Util::money2str($this->headerdata["total"])) + "total" => $this->amount, + "summa" => Util::ucfirst(Util::money2str($this->amount)) ); $report = new \App\Report('returnissue.tpl'); diff --git a/www/app/entity/pay.php b/www/app/entity/pay.php index 6be1f3fad..9415c6773 100644 --- a/www/app/entity/pay.php +++ b/www/app/entity/pay.php @@ -15,6 +15,7 @@ protected function init() { $this->pl_id = 0; $this->paydate = time(); } + protected function afterLoad() { $this->paydate = strtotime($this->paydate); diff --git a/www/app/modules/ocstore/orders.php b/www/app/modules/ocstore/orders.php index 27926c0ee..b3e10d72f 100644 --- a/www/app/modules/ocstore/orders.php +++ b/www/app/modules/ocstore/orders.php @@ -148,7 +148,6 @@ public function onImport($sender) $neworder->headerdata['ocorder']= $shoporder->order_id; $neworder->headerdata['ocorderback'] = 0; $neworder->headerdata['occlient'] .= $shoporder->firstname .' '.$shoporder->lastname ; - $neworder->headerdata['total'] = round($shoporder->total); $neworder->amount= round($shoporder->total); $neworder->notes = "OC номер:{$shoporder->order_id};"; $neworder->notes .= " Клиент:".$shoporder->firstname .' '.$shoporder->lastname.";"; diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php index 2224e5fdb..32b8a2e6a 100644 --- a/www/app/pages/doc/goodsissue.php +++ b/www/app/pages/doc/goodsissue.php @@ -314,22 +314,22 @@ public function savedocOnClick($sender) { $this->calcTotal(); $old = $this->_doc->cast(); - - $this->_doc->headerdata = array( - 'order' => $this->docform->order->getText(), - 'ship_address' => $this->docform->ship_address->getText(), - 'ship_number' => $this->docform->ship_number->getText(), - 'delivery' => $this->docform->delivery->getValue(), - 'planned' => $this->docform->planned->isChecked() ? 1 : 0, - 'store' => $this->docform->store->getValue(), - 'emp_id' => $this->docform->emp->getValue(), - 'emp_name' => $this->docform->emp->getValueName(), - 'pricetype' => $this->docform->pricetype->getValue(), - 'pricetypename' => $this->docform->pricetype->getValueName(), - 'delivery_date' => $this->docform->delivery_date->getDate(), - 'sent_date' => $this->docform->sent_date->getDate(), - 'order_id' => $this->_order_id - ); + + $this->_doc->headerdata['order'] = $this->docform->order->getText(); + $this->_doc->headerdata['ship_address'] = $this->docform->ship_address->getText(); + $this->_doc->headerdata['ship_number'] = $this->docform->ship_number->getText(); + $this->_doc->headerdata['delivery'] = $this->docform->delivery->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['emp_id'] = $this->docform->emp->getValue(); + $this->_doc->headerdata['emp_name'] = $this->docform->emp->getValueName(); + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); + $this->_doc->headerdata['delivery_date'] = $this->docform->delivery_date->getDate(); + $this->_doc->headerdata['sent_date'] = $this->docform->sent_date->getDate(); + $this->_doc->headerdata['order_id'] = $this->_order_id; + + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/doc/goodsreceipt.php b/www/app/pages/doc/goodsreceipt.php index b22a6dc7d..a34cf8119 100644 --- a/www/app/pages/doc/goodsreceipt.php +++ b/www/app/pages/doc/goodsreceipt.php @@ -308,14 +308,15 @@ public function savedocOnClick($sender) { } } - - $this->_doc->headerdata = array( - 'order' => $this->docform->order->getText(), - 'store' => $this->docform->store->getValue(), - 'planned' => $this->docform->planned->isChecked() ? 1 : 0, - 'total' => $this->docform->total->getText(), - 'order_id' => $this->_order_id - ); + + + $this->_doc->headerdata['order'] = $this->docform->order->getText(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + + $this->_doc->headerdata['order_id'] = $this->_order_id; + + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/moveitem.php b/www/app/pages/doc/moveitem.php index 83ca36eaf..7d141908b 100644 --- a/www/app/pages/doc/moveitem.php +++ b/www/app/pages/doc/moveitem.php @@ -175,12 +175,12 @@ public function savedocOnClick($sender) { return; } $this->_doc->notes = $this->docform->notes->getText(); - - - $this->_doc->headerdata = array( - 'storefrom' => $this->docform->storefrom->getValue(), - 'storeto' => $this->docform->storeto->getValue() - ); + + + $this->_doc->headerdata['storefrom'] = $this->docform->storefrom->getValue(); + $this->_doc->headerdata['storeto'] = $this->docform->storeto->getValue(); + + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/order.php b/www/app/pages/doc/order.php index 301ed03f1..cdd6e3857 100644 --- a/www/app/pages/doc/order.php +++ b/www/app/pages/doc/order.php @@ -240,7 +240,7 @@ public function savedocOnClick($sender) { $this->_doc->headerdata['email'] = $this->docform->email->getText(); $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - $this->_doc->headerdata['total'] = $this->docform->total->getText(); + $this->_doc->detaildata = array(); diff --git a/www/app/pages/doc/ordercust.php b/www/app/pages/doc/ordercust.php index bbc2d4e8c..2d05e3841 100644 --- a/www/app/pages/doc/ordercust.php +++ b/www/app/pages/doc/ordercust.php @@ -233,11 +233,8 @@ public function savedocOnClick($sender) { if ($common['useval'] != true) continue; } - - - $this->_doc->headerdata = array( - 'total' => $this->docform->total->getText() - ); + + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/prodissue.php b/www/app/pages/doc/prodissue.php index f8d07f20f..e995ddbbf 100644 --- a/www/app/pages/doc/prodissue.php +++ b/www/app/pages/doc/prodissue.php @@ -202,14 +202,14 @@ public function savedocOnClick($sender) { $this->calcTotal(); $old = $this->_doc->cast(); - - $this->_doc->headerdata = array( - 'parea' => $this->docform->parea->getValue(), - 'pareaname' => $this->docform->parea->getValueName(), - 'store' => $this->docform->store->getValue(), - 'planned' => $this->docform->planned->isChecked() ? 1 : 0, - 'total' => $this->docform->total->getText() - ); + + + $this->_doc->headerdata['parea'] = $this->docform->parea->getValue(); + $this->_doc->headerdata['pareaname'] = $this->docform->parea->getValueName(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/doc/prodreceipt.php b/www/app/pages/doc/prodreceipt.php index 4409d1421..e529d2e70 100644 --- a/www/app/pages/doc/prodreceipt.php +++ b/www/app/pages/doc/prodreceipt.php @@ -216,17 +216,13 @@ public function savedocOnClick($sender) { } $old = $this->_doc->cast(); $this->calcTotal(); - - - - - $this->_doc->headerdata = array( - 'parea' => $this->docform->parea->getValue(), - 'pareaname' => $this->docform->parea->getValueName(), - 'store' => $this->docform->store->getValue(), - 'planned' => $this->docform->planned->isChecked() ? 1 : 0, - 'total' => $this->docform->total->getText() - ); + + + $this->_doc->headerdata['parea'] = $this->docform->parea->getValue(); + $this->_doc->headerdata['pareaname'] = $this->docform->parea->getValueName(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/retcustissue.php b/www/app/pages/doc/retcustissue.php index 9f6c03879..9cf16489f 100644 --- a/www/app/pages/doc/retcustissue.php +++ b/www/app/pages/doc/retcustissue.php @@ -241,9 +241,9 @@ public function savedocOnClick($sender) { $this->calcTotal(); $old = $this->_doc->cast(); - $this->_doc->headerdata = array( - 'store' => $this->docform->store->getValue() - ); + + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/doc/returnissue.php b/www/app/pages/doc/returnissue.php index e15ff9753..271921d73 100644 --- a/www/app/pages/doc/returnissue.php +++ b/www/app/pages/doc/returnissue.php @@ -220,10 +220,9 @@ public function savedocOnClick($sender) { $this->calcTotal(); $old = $this->_doc->cast(); - $this->_doc->headerdata = array( - 'store' => $this->docform->store->getValue(), - 'total' => $this->docform->total->getText() - ); + + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/doc/serviceact.php b/www/app/pages/doc/serviceact.php index 95102d027..5410d492f 100644 --- a/www/app/pages/doc/serviceact.php +++ b/www/app/pages/doc/serviceact.php @@ -239,13 +239,13 @@ public function savedocOnClick($sender) { $old = $this->_doc->cast(); - $this->_doc->headerdata = array( - 'order' => $this->docform->order->getText(), - 'order_id' => $this->_order_id, - 'planned' => $this->docform->planned->isChecked() ? 1 : 0, - 'gar' => $this->docform->gar->getText(), - 'total' => $this->docform->total->getText(), - ); + + + $this->_doc->headerdata['order'] = $this->docform->order->getText(); + $this->_doc->headerdata['order_id'] = $this->_order_id; + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0,; + $this->_doc->headerdata['gar'] = $this->docform->gar->getText(); + $this->_doc->detaildata = array(); foreach ($this->_servicelist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/serviceorder.php b/www/app/pages/doc/serviceorder.php index e96077103..79533629f 100644 --- a/www/app/pages/doc/serviceorder.php +++ b/www/app/pages/doc/serviceorder.php @@ -198,10 +198,8 @@ public function savedocOnClick($sender) { $this->calcTotal(); $old = $this->_doc->cast(); - - $this->_doc->headerdata = array( - 'total' => $this->docform->total->getText() - ); + + $this->_doc->detaildata = array(); foreach ($this->_servicelist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/task.php b/www/app/pages/doc/task.php index 423f4adab..6cabccd51 100644 --- a/www/app/pages/doc/task.php +++ b/www/app/pages/doc/task.php @@ -485,17 +485,17 @@ public function savedocOnClick($sender) { $old = $this->_doc->cast(); - $this->_doc->headerdata = array( - 'parea' => $this->docform->parea->getValue(), - 'pareaname' => $this->docform->parea->getValueName(), - 'pricetype' => $this->docform->pricetype->getValue(), - 'pricetypename' => $this->docform->pricetype->getValueName(), - 'store' => $this->docform->store->getValue(), - 'hours' => $this->docform->hours->getText(), - 'start_date' => $this->docform->start_date->getDate(), - 'end_date' => $this->docform->document_date->getDate(), - 'total' => $this->docform->total->getText() - ); + + $this->_doc->headerdata['parea'] = $this->docform->parea->getText(); + $this->_doc->headerdata['pareaname'] = $this->docform->pareaname->getValueName(); + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['hours'] = $this->docform->hours->getText(); + $this->_doc->headerdata['start_date'] = $this->docform->start_date->getDate(); + $this->_doc->headerdata['end_date'] = $this->docform->end_date->getDate(); + + $this->_doc->detaildata = array(); foreach ($this->_servicelist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/transitem.php b/www/app/pages/doc/transitem.php index 0bcfe6b0d..d3432e7d8 100644 --- a/www/app/pages/doc/transitem.php +++ b/www/app/pages/doc/transitem.php @@ -83,14 +83,13 @@ public function savedocOnClick($sender) { $this->_doc->notes = $this->docform->notes->getText(); - - $this->_doc->headerdata = array( - 'storefrom' => $this->docform->storefrom->getValue(), - 'fromitem' => $this->docform->fromitem->getKey(), - 'toitem' => $this->docform->toitem->getKey(), - 'fromquantity' => $this->docform->fromquantity->getText(), - 'toquantity' => $this->docform->toquantity->getText() - ); + + $this->_doc->headerdata['storefrom'] = $this->docform->storefrom->getValue(); + $this->_doc->headerdata['fromitem'] = $this->docform->fromitem->getKey(); + $this->_doc->headerdata['toitem'] = $this->docform->toitem->getKey(); + $this->_doc->headerdata['fromquantity'] = $this->docform->fromquantity->getText(); + $this->_doc->headerdata['toquantity'] = $this->docform->toquantity->getText(); + if ($this->checkForm() == false) { return; diff --git a/www/app/pages/doc/warranty.php b/www/app/pages/doc/warranty.php index 7d8b173c6..eb14b3b4b 100644 --- a/www/app/pages/doc/warranty.php +++ b/www/app/pages/doc/warranty.php @@ -211,11 +211,11 @@ public function savedocOnClick($sender) { $this->_doc->notes = $this->docform->notes->getText(); $this->_doc->customer_id = $this->docform->customer->getKey(); - - $this->_doc->headerdata = array( - 'pricetypename' => $this->docform->pricetype->getValueName(), - 'pricetype' => $this->docform->pricetype->getValue(), - ); + + + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/import.php b/www/app/pages/import.php index b44a949c1..87bd07f07 100644 --- a/www/app/pages/import.php +++ b/www/app/pages/import.php @@ -188,7 +188,7 @@ public function onImport($sender) { } $doc->amount = $amount; $doc->headerdata['store'] = $store; - $doc->headerdata['total'] = $amount; + $doc->save(); $doc->updateStatus(\App\Entity\Doc\Document::STATE_NEW); $doc->updateStatus(\App\Entity\Doc\Document::STATE_EXECUTED); From ddc00979a21b79b3ffe937037661c8e4e581e6e1 Mon Sep 17 00:00:00 2001 From: Leon Date: Wed, 12 Jun 2019 23:42:00 +0300 Subject: [PATCH 12/17] x --- www/app/entity/doc/document.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index 01ffb1c51..9f47a8984 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -218,6 +218,8 @@ protected function Cancel() { $conn->Execute("delete from entrylist where document_id =" . $this->document_id); //удаляем освободившиеся стоки $conn->Execute("delete from store_stock where stock_id not in (select stock_id from entrylist) "); + //удаляем оплаты + $conn->Execute("delete from paylist where document_id =" . $this->document_id); $conn->CompleteTrans(); From b0d3690571ea0d04c6e0ce47b9eb744ae26edcf5 Mon Sep 17 00:00:00 2001 From: Leon Date: Thu, 13 Jun 2019 15:11:55 +0300 Subject: [PATCH 13/17] =?UTF-8?q?before=20delete=20=D1=81=20=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B9=20zdb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/category.php | 7 +++ www/app/entity/customer.php | 8 +-- www/app/entity/doc/document.php | 5 ++ www/app/entity/equipment.php | 10 +--- www/app/entity/item.php | 11 ++--- www/app/entity/metadata.php | 4 +- www/app/entity/store.php | 6 +-- www/app/entity/user.php | 4 ++ www/app/modules/shop/entity/manufacturer.php | 13 ++--- www/app/modules/shop/entity/product.php | 21 ++++---- .../modules/shop/entity/productattribute.php | 2 +- www/app/modules/shop/entity/productgroup.php | 14 +++++- www/app/modules/shop/pages/grouplist.php | 10 ++-- www/app/modules/shop/pages/manufacturers.php | 9 ++-- www/app/modules/shop/pages/productlist.php | 9 ++-- www/app/pages/reference/categorylist.php | 11 +++-- www/app/pages/reference/customerlist.php | 9 ++-- www/app/pages/reference/itemlist.php | 10 ++-- www/app/pages/reference/mflist.php | 6 +-- www/app/pages/reference/storelist.php | 9 ++-- www/app/pages/users.php | 7 ++- www/composer.json | 2 +- www/composer.lock | 49 ++++++++++--------- 23 files changed, 129 insertions(+), 107 deletions(-) diff --git a/www/app/entity/category.php b/www/app/entity/category.php index d266cda4b..1c248e6a7 100644 --- a/www/app/entity/category.php +++ b/www/app/entity/category.php @@ -13,5 +13,12 @@ class Category extends \ZCL\DB\Entity { protected function init() { $this->cat_id = 0; } + + protected function beforeDelete() { + $conn = \ZDB\DB::getConnect(); + $sql = " select count(*) from items where cat_id = {$this->cat_id}"; + $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Категория используется в товарах" : ""; + } } diff --git a/www/app/entity/customer.php b/www/app/entity/customer.php index 8c4fcb4ed..465ba920a 100644 --- a/www/app/entity/customer.php +++ b/www/app/entity/customer.php @@ -48,13 +48,13 @@ public function beforeDelete() { $sql = " select count(*) from entrylist where customer_id = {$this->customer_id}"; $cnt = $conn->GetOne($sql); if ($cnt > 0) - return false; + return "На контрагента есть ссылки в документах"; $sql = " select count(*) from documents where customer_id = {$this->customer_id} "; $cnt = $conn->GetOne($sql); if ($cnt > 0) - return false; - return true; - ; + return "На контрагента есть ссылки в документах"; + return ""; + } /** diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index 9f47a8984..96cd8a47a 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -488,6 +488,11 @@ protected function beforeDelete() { return "У документа есть записи в аналитике"; } + $cnt = $conn->GetOne("select count(*) from paylist where document_id = {$this->document_id} "); + if ($cnt > 0) { + + return "У документа есть оплаты"; + } $cnt = $conn->GetOne("select count(*) from docrel where doc1 = {$this->document_id} or doc2 = {$this->document_id}"); diff --git a/www/app/entity/equipment.php b/www/app/entity/equipment.php index 0fae34898..896e158e6 100644 --- a/www/app/entity/equipment.php +++ b/www/app/entity/equipment.php @@ -43,14 +43,6 @@ protected function afterLoad() { parent::afterLoad(); } - protected function beforeDelete() { - - return $this->checkDelete(); - } - - public function checkDelete() { - - return true; - } + } diff --git a/www/app/entity/item.php b/www/app/entity/item.php index 9ca0ce445..9d768fe5f 100644 --- a/www/app/entity/item.php +++ b/www/app/entity/item.php @@ -63,18 +63,15 @@ protected function beforeSave() { protected function beforeDelete() { - return $this->checkDelete(); - } - - public function checkDelete() { - $conn = \ZDB\DB::getConnect(); - + //проверка на партии $sql = " select count(*) from store_stock where item_id = {$this->item_id}"; $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? false : true; + return ($cnt > 0) ? "ТМЦ уже используется" : "true"; } + + //Вычисляет отпускную цену //$_price - цифра (заданая цена) или наименование цены из настроек //$partionprice - учетная цена diff --git a/www/app/entity/metadata.php b/www/app/entity/metadata.php index 9575bcf4b..91032c21e 100644 --- a/www/app/entity/metadata.php +++ b/www/app/entity/metadata.php @@ -15,9 +15,7 @@ class MetaData extends \ZCL\DB\Entity { const METATYPE_REF = 3; const METATYPE_REG = 4; - protected function beforeDelete() { - return true; - } + public static function getNames() { $list = array(); diff --git a/www/app/entity/store.php b/www/app/entity/store.php index c5e7038f2..7e41bd4bc 100644 --- a/www/app/entity/store.php +++ b/www/app/entity/store.php @@ -18,9 +18,9 @@ protected function init() { protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); - // $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; - // $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? false : true; + $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; + $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Нельзя удалять используемый склад" : true; } /** diff --git a/www/app/entity/user.php b/www/app/entity/user.php index 178054503..21d99841f 100644 --- a/www/app/entity/user.php +++ b/www/app/entity/user.php @@ -90,7 +90,11 @@ protected function beforeSave() { * */ protected function beforeDelete() { + $conn = \ZDB\DB::getConnect(); + $sql = " select count(*) from documents where user_id = {$this->user_id}"; + $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Нельзя удалять пользователя с документами" : true; } /** diff --git a/www/app/modules/shop/entity/manufacturer.php b/www/app/modules/shop/entity/manufacturer.php index 75042a338..25cb30ae7 100644 --- a/www/app/modules/shop/entity/manufacturer.php +++ b/www/app/modules/shop/entity/manufacturer.php @@ -15,15 +15,12 @@ protected function init() { protected function beforeDelete() { - return $this->checkDelete(); - } - - public function checkDelete() { - - $conn = \ZDB\DB::getConnect(); - $sql = " select count(*) from store_stock where item_id = {$this->item_id}"; + $conn = \ZDB\DB::getConnect(); + $sql = " select count(*) from shop_products where manufacturer_id = {$this->manufacturer_id}"; $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? false : true; + return ($cnt > 0) ? "Производитель используется в товарах" : ""; } + + } diff --git a/www/app/modules/shop/entity/product.php b/www/app/modules/shop/entity/product.php index cbefb5275..ea349d318 100644 --- a/www/app/modules/shop/entity/product.php +++ b/www/app/modules/shop/entity/product.php @@ -93,21 +93,20 @@ protected function afterSave($update) { } protected function beforeDelete() { + + $conn = \ZDB\DB::getConnect(); + $sql = " select count(*) from documents_view where meta_name='Order' and content like '%{$this->product_id}%' "; + $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Товар уже использован в заказах" : ""; - if (false == $this->checkDelete()) - return false; - $conn = \ZCL\DB\DB::getConnect(); - $conn->Execute("delete from shop_attributevalues where product_id=" . $this->product_id); - \App\Entity\Image::delete($this->image_id); } - public function checkDelete() { - - $conn = \ZDB\DB::getConnect(); - $sql = " select count(*) from documents_view where meta_name='Order' and content like '%{$this->product_id}%' "; - $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? false : true; + public function afterDelete() { + + $conn = \ZCL\DB\DB::getConnect(); + $conn->Execute("delete from shop_attributevalues where product_id=" . $this->product_id); + \App\Entity\Image::delete($this->image_id); } /** diff --git a/www/app/modules/shop/entity/productattribute.php b/www/app/modules/shop/entity/productattribute.php index a626da3e8..4ead8c131 100644 --- a/www/app/modules/shop/entity/productattribute.php +++ b/www/app/modules/shop/entity/productattribute.php @@ -19,7 +19,7 @@ protected function init() { $this->value = ''; } - protected function beforeDelete() { + protected function afterDelete() { $conn = \ZCL\DB\DB::getConnect(); $conn->Execute("delete from shop_attributevalues where attribute_id=" . $this->attribute_id); $conn->Execute("delete from shop_attributes_order where attr_id=" . $this->attribute_id); diff --git a/www/app/modules/shop/entity/productgroup.php b/www/app/modules/shop/entity/productgroup.php index 7904be6d8..d3795218c 100644 --- a/www/app/modules/shop/entity/productgroup.php +++ b/www/app/modules/shop/entity/productgroup.php @@ -18,7 +18,19 @@ protected function init() { $this->mpath = ''; } - protected function beforeDelete() { + + protected function beforeDelete() { + + $conn = \ZDB\DB::getConnect(); + $sql = " select count(*) from shop_products where group_id = {$this->group_id}"; + $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Нельзя удалять используемую группу" : ""; + + + } + + + protected function afterDelete() { $conn = \ZCL\DB\DB::getConnect(); $conn->Execute("delete from shop_attributes where group_id =" . $this->group_id); foreach ($this->images as $image_id) { diff --git a/www/app/modules/shop/pages/grouplist.php b/www/app/modules/shop/pages/grouplist.php index b5edd4677..ebb0db344 100644 --- a/www/app/modules/shop/pages/grouplist.php +++ b/www/app/modules/shop/pages/grouplist.php @@ -161,12 +161,12 @@ public function OnRenameGroup($sender) { } public function OnDelGroup($sender) { - $pcnt = Product::findCnt("group_id=" . $this->group->group_id); - if ($pcnt > 0) { - $this->setError('Граппа с товарами!'); + + $del=ProductGroup::delete($this->group->group_id); + if(strlen($del) > 0){ + $this->setError($del); return; - } - ProductGroup::delete($this->group->group_id); + } $this->group = null; $this->ReloadTree(); } diff --git a/www/app/modules/shop/pages/manufacturers.php b/www/app/modules/shop/pages/manufacturers.php index 08de5980f..52c3d81cf 100644 --- a/www/app/modules/shop/pages/manufacturers.php +++ b/www/app/modules/shop/pages/manufacturers.php @@ -41,11 +41,12 @@ public function __construct() { public function OnDeleteClick($sender) { $item = $sender->getOwner()->getDataItem(); - if (false == $item->checkDelete()) { - $this->setError("Этот бренд уже используется"); + + $del=Manufacturer::delete($item->manufacturer_id); + if(strlen($del) > 0){ + $this->setError($del); return; - } - Manufacturer::delete($item->manufacturer_id); + } $this->list->manufacturerslist->Reload(); } diff --git a/www/app/modules/shop/pages/productlist.php b/www/app/modules/shop/pages/productlist.php index 3d79d2e0d..517f958df 100644 --- a/www/app/modules/shop/pages/productlist.php +++ b/www/app/modules/shop/pages/productlist.php @@ -310,11 +310,12 @@ public function bcancelOnClick($sender) { } public function bdeleteOnClick($sender) { - if ($this->product->checkDelete() == false) { - $this->setError('Продукт уже используется'); + + $del=Product::delete($this->product->product_id); + if(strlen($del) > 0){ + $this->setError($del); return; - } - Product::delete($this->product->product_id); + } $this->listpanel->plist->Reload(); $this->editpanel->setVisible(false); $this->listpanel->setVisible(true); diff --git a/www/app/pages/reference/categorylist.php b/www/app/pages/reference/categorylist.php index 7b2f3ff93..6dccb4c03 100644 --- a/www/app/pages/reference/categorylist.php +++ b/www/app/pages/reference/categorylist.php @@ -47,12 +47,13 @@ public function deleteOnClick($sender) { $cat_id = $sender->owner->getDataItem()->cat_id; - $cnt = \App\Entity\Item::findCnt(" disabled <> 1 and cat_id=" . $cat_id); - if ($cnt > 0) { - $this->setError('Нельзя удалить категорию с товарами'); + + $del=Category::delete($cat_id); + if(strlen($del) > 0){ + $this->setError($del); return; - } - Category::delete($cat_id); + } + $this->categorytable->categorylist->Reload(); } diff --git a/www/app/pages/reference/customerlist.php b/www/app/pages/reference/customerlist.php index 165aaab1b..db0cf3391 100644 --- a/www/app/pages/reference/customerlist.php +++ b/www/app/pages/reference/customerlist.php @@ -139,11 +139,12 @@ public function deleteOnClick($sender) { return; - if (false == Customer::delete($sender->owner->getDataItem()->customer_id)) { - $this->setError("Нельзя удалить контрагента"); + $del = Customer::delete($sender->owner->getDataItem()->customer_id)); + if(strlen($del) > 0){ + $this->setError($del); return; - } - ; + } + $this->customertable->customerlist->Reload(); } diff --git a/www/app/pages/reference/itemlist.php b/www/app/pages/reference/itemlist.php index ae2bfb7e3..51f238d68 100644 --- a/www/app/pages/reference/itemlist.php +++ b/www/app/pages/reference/itemlist.php @@ -145,16 +145,14 @@ public function deleteOnClick($sender) { return; $item = $sender->owner->getDataItem(); - //проверка на партии - if ($item->checkDelete()) { - Item::delete($item->item_id); - } else { - $this->setError("Нельзя удалить товар"); + + $del= Item::delete($item->item_id) ; + if(strlen($del) > 0){ + $this->setError($del); return; } - $this->itemtable->itemlist->Reload(); } diff --git a/www/app/pages/reference/mflist.php b/www/app/pages/reference/mflist.php index 14acb66b3..7aa797b9e 100644 --- a/www/app/pages/reference/mflist.php +++ b/www/app/pages/reference/mflist.php @@ -57,9 +57,9 @@ public function deleteOnClick($sender) { $mf_id = $sender->owner->getDataItem()->mf_id; - $rc = MoneyFund::delete($mf_id); - if(strlen($rc) > 0){ - $this->setError($rc) ; + $del = MoneyFund::delete($mf_id); + if(strlen($del) > 0){ + $this->setError($del) ; return; } $this->mftable->mflist->Reload(); diff --git a/www/app/pages/reference/storelist.php b/www/app/pages/reference/storelist.php index 8b1ce5976..0678e6b32 100644 --- a/www/app/pages/reference/storelist.php +++ b/www/app/pages/reference/storelist.php @@ -56,12 +56,13 @@ public function storeeditOnClick($sender) { public function storedeleteOnClick($sender) { if (false == \App\ACL::checkEditRef('StoreList')) return; - - if (false == Store::delete($sender->owner->getDataItem()->store_id)) { - $this->setError("Нельзя удалить цей склад"); + + + $del = Store::delete($sender->owner->getDataItem()->store_id); + if(strlen($del) > 0){ + $this->setError($del); return; } - $this->storetable->storelist->Reload(); } diff --git a/www/app/pages/users.php b/www/app/pages/users.php index b353b5b4e..574f46db5 100644 --- a/www/app/pages/users.php +++ b/www/app/pages/users.php @@ -208,7 +208,12 @@ public function onAcl($sender) { //удаление юзера public function OnRemove($sender) { $user = $sender->getOwner()->getDataItem(); - User::delete($user->user_id); + $del = User::delete($user->user_id); + if(strlen($del) > 0){ + $this->setError($del) ; + return; + } + $this->listpan->userrow->Reload(); } diff --git a/www/composer.json b/www/composer.json index b986c6d8b..9b36c0459 100644 --- a/www/composer.json +++ b/www/composer.json @@ -10,6 +10,6 @@ "dompdf/dompdf": "v0.8.2", "roave/security-advisories": "dev-master", "rmccue/requests": ">=1.0", - "leon-mbs/zippy": "2.1.7" + "leon-mbs/zippy": "2.1.8" } } \ No newline at end of file diff --git a/www/composer.lock b/www/composer.lock index 166d54134..95e673eaa 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "4828ee45d50ee19724725fae2e83aec1", + "content-hash": "fb37ffb4f3bfe6b2bf59f1d02871c1d4", "packages": [ { "name": "adodb/adodb-php", - "version": "v5.20.12", + "version": "v5.20.14", "source": { "type": "git", "url": "https://github.com/ADOdb/ADOdb.git", - "reference": "0e5243790c5a02a88b0dfe78c390fe795ad2d672" + "reference": "a32113c6b3e4e2cb8ae6b49752527d5668a9d7a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/0e5243790c5a02a88b0dfe78c390fe795ad2d672", - "reference": "0e5243790c5a02a88b0dfe78c390fe795ad2d672", + "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/a32113c6b3e4e2cb8ae6b49752527d5668a9d7a6", + "reference": "a32113c6b3e4e2cb8ae6b49752527d5668a9d7a6", "shasum": "" }, "require": { @@ -58,7 +58,7 @@ "library", "php" ], - "time": "2018-03-30T17:31:04+00:00" + "time": "2019-01-05T23:16:44+00:00" }, { "name": "dompdf/dompdf", @@ -430,20 +430,20 @@ }, { "name": "leon-mbs/zdb", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/leon-mbs/zdb.git", - "reference": "d756d6bf5172dfefcc0f18dcca524d1a6747a68f" + "reference": "5e45065f0f14dff6ec82ea255edb7fcf8632f03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/leon-mbs/zdb/zipball/d756d6bf5172dfefcc0f18dcca524d1a6747a68f", - "reference": "d756d6bf5172dfefcc0f18dcca524d1a6747a68f", + "url": "https://api.github.com/repos/leon-mbs/zdb/zipball/5e45065f0f14dff6ec82ea255edb7fcf8632f03c", + "reference": "5e45065f0f14dff6ec82ea255edb7fcf8632f03c", "shasum": "" }, "require": { - "adodb/adodb-php": "v5.20.12", + "adodb/adodb-php": "v5.20.14", "php": ">=5.4.0" }, "type": "library", @@ -468,25 +468,25 @@ "database", "php" ], - "time": "2018-11-08T23:38:18+00:00" + "time": "2019-06-13T11:05:37+00:00" }, { "name": "leon-mbs/zippy", - "version": "2.1.7", + "version": "2.1.8", "source": { "type": "git", "url": "https://github.com/leon-mbs/zippy.git", - "reference": "d3f01409831afa16393925baef435005c18c1654" + "reference": "c6e81df4f0ab0532a049009f2b10856cb130e05d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/leon-mbs/zippy/zipball/d3f01409831afa16393925baef435005c18c1654", - "reference": "d3f01409831afa16393925baef435005c18c1654", + "url": "https://api.github.com/repos/leon-mbs/zippy/zipball/c6e81df4f0ab0532a049009f2b10856cb130e05d", + "reference": "c6e81df4f0ab0532a049009f2b10856cb130e05d", "shasum": "" }, "require": { "electrolinux/phpquery": ">=0.9.6", - "leon-mbs/zdb": ">=1.0.8", + "leon-mbs/zdb": "1.2.0", "mustache/mustache": "v2.12.0", "php": ">=5.4.0" }, @@ -512,7 +512,7 @@ "framework", "php" ], - "time": "2019-06-06T09:34:14+00:00" + "time": "2019-06-13T11:11:56+00:00" }, { "name": "monolog/monolog", @@ -993,12 +993,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "4c0ba8a35f1f12dd9236452e9fae4346b0bf2a56" + "reference": "acc661e72817c7030b7b2af7d2f226bee9b93094" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4c0ba8a35f1f12dd9236452e9fae4346b0bf2a56", - "reference": "4c0ba8a35f1f12dd9236452e9fae4346b0bf2a56", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/acc661e72817c7030b7b2af7d2f226bee9b93094", + "reference": "acc661e72817c7030b7b2af7d2f226bee9b93094", "shasum": "" }, "conflict": { @@ -1093,7 +1093,10 @@ "shopware/shopware": "<5.3.7", "silverstripe/cms": ">=3,<=3.0.11|>=3.1,<3.1.11", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": ">=3,<3.6.7|>=3.7,<3.7.3|>=4,<4.0.7|>=4.1,<4.1.5|>=4.2,<4.2.4|>=4.3,<4.3.1", + "silverstripe/framework": ">=3,<3.6.7|>=3.7,<3.7.3|>=4,<4.4", + "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.1.2", + "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", + "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", @@ -1196,7 +1199,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-05-23T20:42:12+00:00" + "time": "2019-06-11T05:51:05+00:00" }, { "name": "sabberworm/php-css-parser", From 195ad27d728aacd8e56b7c8ad79ed7c6ee555f94 Mon Sep 17 00:00:00 2001 From: Leon Date: Thu, 13 Jun 2019 21:40:20 +0300 Subject: [PATCH 14/17] fix --- www/app/entity/item.php | 2 +- www/app/entity/prodarea.php | 9 +++++ www/app/entity/service.php | 8 ++++ www/app/pages/reference/customerlist.php | 2 +- www/app/pages/reference/prodarealist.php | 12 +++--- www/app/pages/reference/servicelist.php | 12 +++--- www/composer.lock | 47 ++++++++++++------------ 7 files changed, 54 insertions(+), 38 deletions(-) diff --git a/www/app/entity/item.php b/www/app/entity/item.php index 9d768fe5f..1f20e6c3e 100644 --- a/www/app/entity/item.php +++ b/www/app/entity/item.php @@ -67,7 +67,7 @@ protected function beforeDelete() { //проверка на партии $sql = " select count(*) from store_stock where item_id = {$this->item_id}"; $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? "ТМЦ уже используется" : "true"; + return ($cnt > 0) ? "ТМЦ уже используется" : ""; } diff --git a/www/app/entity/prodarea.php b/www/app/entity/prodarea.php index cbd413451..fc0928c25 100644 --- a/www/app/entity/prodarea.php +++ b/www/app/entity/prodarea.php @@ -14,4 +14,13 @@ protected function init() { $this->pa_id = 0; } + protected function beforeDelete() { + + $conn = \ZDB\DB::getConnect(); + // $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; + // $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Нельзя удалять используемый склад" : true; + } + + } diff --git a/www/app/entity/service.php b/www/app/entity/service.php index db15bee3c..03c3c68fb 100644 --- a/www/app/entity/service.php +++ b/www/app/entity/service.php @@ -39,4 +39,12 @@ protected function beforeSave() { return true; } + protected function beforeDelete() { + + $conn = \ZDB\DB::getConnect(); + // $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; + // $cnt = $conn->GetOne($sql); + return ($cnt > 0) ? "Нельзя удалять используемую услугу" : ""; + } + } diff --git a/www/app/pages/reference/customerlist.php b/www/app/pages/reference/customerlist.php index db0cf3391..f38dce23f 100644 --- a/www/app/pages/reference/customerlist.php +++ b/www/app/pages/reference/customerlist.php @@ -139,7 +139,7 @@ public function deleteOnClick($sender) { return; - $del = Customer::delete($sender->owner->getDataItem()->customer_id)); + $del = Customer::delete($sender->owner->getDataItem()->customer_id); if(strlen($del) > 0){ $this->setError($del); return; diff --git a/www/app/pages/reference/prodarealist.php b/www/app/pages/reference/prodarealist.php index fb6baae97..cf58c2f30 100644 --- a/www/app/pages/reference/prodarealist.php +++ b/www/app/pages/reference/prodarealist.php @@ -43,14 +43,12 @@ public function deleteOnClick($sender) { if (false == \App\ACL::checkEditRef('ProdAreaList')) return; - - $pa_id = $sender->owner->getDataItem()->pa_id; - // $cnt = \App\Entity\Item::findCnt(" disabled <> 1 and cat_id=" . $pa_id); - if ($cnt > 0) { - $this->setError('Нельзя удалить участок '); + + $del=ProdArea::delete($pa_id); + if(strlen($del) > 0){ + $this->setError($del); return; - } - ProdArea::delete($pa_id); + } $this->patable->palist->Reload(); } diff --git a/www/app/pages/reference/servicelist.php b/www/app/pages/reference/servicelist.php index 95d6f4731..b08087d2e 100644 --- a/www/app/pages/reference/servicelist.php +++ b/www/app/pages/reference/servicelist.php @@ -50,12 +50,12 @@ public function deleteOnClick($sender) { return; $service_id = $sender->owner->getDataItem()->service_id; - // $cnt= \App\Entity\Item::findCnt(" disabled <> 1 and cat_id=".$cat_id); - if ($cnt > 0) { - // $this->setError('Нельзя удалить категорию с товарами'); - // return; - } - Service::delete($service_id); + + $del=Service::delete($service_id); + if(strlen($del) > 0){ + $this->setError($del); + return; + } $this->servicetable->servicelist->Reload(); } diff --git a/www/composer.lock b/www/composer.lock index 95e673eaa..7c2c20012 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -4,6 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], + "hash": "828dd5b9b513945e650d70e2504ae247", "content-hash": "fb37ffb4f3bfe6b2bf59f1d02871c1d4", "packages": [ { @@ -58,7 +59,7 @@ "library", "php" ], - "time": "2019-01-05T23:16:44+00:00" + "time": "2019-01-05 23:16:44" }, { "name": "dompdf/dompdf", @@ -120,7 +121,7 @@ ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", - "time": "2017-11-26T14:49:08+00:00" + "time": "2017-11-26 14:49:08" }, { "name": "electrolinux/phpquery", @@ -160,7 +161,7 @@ ], "description": "phpQuery is a server-side, chainable, CSS3 selector driven Document Object Model (DOM) API based on jQuery JavaScript Library", "homepage": "http://code.google.com/p/phpquery/", - "time": "2013-03-21T12:39:33+00:00" + "time": "2013-03-21 12:39:33" }, { "name": "ircmaxell/password-compat", @@ -202,7 +203,7 @@ "hashing", "password" ], - "time": "2014-11-20T16:49:30+00:00" + "time": "2014-11-20 16:49:30" }, { "name": "jbzoo/data", @@ -266,7 +267,7 @@ "params", "yml" ], - "time": "2017-11-17T15:20:26+00:00" + "time": "2017-11-17 15:20:26" }, { "name": "jbzoo/image", @@ -336,7 +337,7 @@ "thumbnail", "watermark" ], - "time": "2016-06-08T14:21:19+00:00" + "time": "2016-06-08 14:21:19" }, { "name": "jbzoo/utils", @@ -426,7 +427,7 @@ "utility", "utils" ], - "time": "2017-07-19T21:25:44+00:00" + "time": "2017-07-19 21:25:44" }, { "name": "leon-mbs/zdb", @@ -468,7 +469,7 @@ "database", "php" ], - "time": "2019-06-13T11:05:37+00:00" + "time": "2019-06-13 11:05:37" }, { "name": "leon-mbs/zippy", @@ -512,7 +513,7 @@ "framework", "php" ], - "time": "2019-06-13T11:11:56+00:00" + "time": "2019-06-13 11:11:56" }, { "name": "monolog/monolog", @@ -590,7 +591,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2017-06-19 01:22:40" }, { "name": "mustache/mustache", @@ -636,7 +637,7 @@ "mustache", "templating" ], - "time": "2017-07-11T12:54:05+00:00" + "time": "2017-07-11 12:54:05" }, { "name": "nesbot/carbon", @@ -684,7 +685,7 @@ "datetime", "time" ], - "time": "2018-05-29T15:23:46+00:00" + "time": "2018-05-29 15:23:46" }, { "name": "nikic/php-parser", @@ -735,7 +736,7 @@ "parser", "php" ], - "time": "2018-02-28T20:30:58+00:00" + "time": "2018-02-28 20:30:58" }, { "name": "phenx/php-font-lib", @@ -772,7 +773,7 @@ ], "description": "A library to read, parse, export and make subsets of different types of font files.", "homepage": "https://github.com/PhenX/php-font-lib", - "time": "2017-09-13T16:14:37+00:00" + "time": "2017-09-13 16:14:37" }, { "name": "phenx/php-svg-lib", @@ -812,7 +813,7 @@ ], "description": "A library to read, parse and export to PDF SVG files.", "homepage": "https://github.com/PhenX/php-svg-lib", - "time": "2018-06-03T10:10:03+00:00" + "time": "2018-06-03 10:10:03" }, { "name": "phpmailer/phpmailer", @@ -889,7 +890,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2018-11-15T22:32:31+00:00" + "time": "2018-11-15 22:32:31" }, { "name": "psr/log", @@ -936,7 +937,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2018-11-20 15:27:04" }, { "name": "rmccue/requests", @@ -985,7 +986,7 @@ "iri", "sockets" ], - "time": "2016-10-13T00:11:37+00:00" + "time": "2016-10-13 00:11:37" }, { "name": "roave/security-advisories", @@ -1199,7 +1200,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-06-11T05:51:05+00:00" + "time": "2019-06-11 05:51:05" }, { "name": "sabberworm/php-css-parser", @@ -1243,7 +1244,7 @@ "parser", "stylesheet" ], - "time": "2016-07-19T19:14:21+00:00" + "time": "2016-07-19 19:14:21" }, { "name": "symfony/polyfill-mbstring", @@ -1302,7 +1303,7 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-02-06 07:57:58" }, { "name": "symfony/translation", @@ -1372,7 +1373,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-05-01T11:10:09+00:00" + "time": "2019-05-01 11:10:09" }, { "name": "timetoogo/pinq", @@ -1420,7 +1421,7 @@ "pinq", "query" ], - "time": "2017-09-06T06:27:03+00:00" + "time": "2017-09-06 06:27:03" } ], "packages-dev": [], From 1ebf2f53ee52951c46b5cf4b508327a16c0c078d Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 17 Jun 2019 23:43:26 +0300 Subject: [PATCH 15/17] =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=82=D0=B5=D0=B6?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/acl.php | 2 - www/app/application.php | 2 - www/app/entity/category.php | 5 +- www/app/entity/customer.php | 1 - www/app/entity/doc/document.php | 182 +++++------ www/app/entity/doc/goodsissue.php | 17 +- www/app/entity/doc/goodsreceipt.php | 19 +- www/app/entity/doc/incomemoney.php | 41 +++ www/app/entity/doc/moveitem.php | 18 +- www/app/entity/doc/movemoney.php | 42 +++ www/app/entity/doc/outcomemoney.php | 41 +++ www/app/entity/doc/prodissue.php | 14 +- www/app/entity/doc/prodreceipt.php | 18 +- www/app/entity/doc/retcustissue.php | 12 +- www/app/entity/doc/returnissue.php | 13 +- www/app/entity/doc/serviceact.php | 9 +- www/app/entity/doc/task.php | 7 +- www/app/entity/doc/transitem.php | 6 +- www/app/entity/employee.php | 3 + www/app/entity/equipment.php | 2 - www/app/entity/item.php | 7 +- www/app/entity/metadata.php | 2 - www/app/entity/moneyfund.php | 28 +- www/app/entity/pay.php | 43 ++- www/app/entity/prodarea.php | 5 +- www/app/entity/service.php | 6 +- www/app/entity/stock.php | 31 +- www/app/entity/store.php | 4 +- www/app/entity/user.php | 4 +- www/app/helper.php | 26 +- www/app/modules/ocstore/helper.php | 15 +- www/app/modules/ocstore/items.php | 298 +++++++++--------- www/app/modules/ocstore/options.php | 41 ++- www/app/modules/ocstore/orders.php | 246 +++++++-------- www/app/modules/shop/entity/manufacturer.php | 6 +- www/app/modules/shop/entity/product.php | 8 +- www/app/modules/shop/entity/productgroup.php | 10 +- www/app/modules/shop/pages/grouplist.php | 16 +- www/app/modules/shop/pages/manufacturers.php | 14 +- www/app/modules/shop/pages/options.php | 6 +- www/app/modules/shop/pages/productlist.php | 14 +- www/app/pages/base.php | 7 +- www/app/pages/doc/goodsissue.php | 64 ++-- www/app/pages/doc/goodsreceipt.php | 70 ++-- www/app/pages/doc/incomemoney.php | 120 +++++++ www/app/pages/doc/moveitem.php | 20 +- www/app/pages/doc/movemoney.php | 126 ++++++++ www/app/pages/doc/order.php | 26 +- www/app/pages/doc/ordercust.php | 8 +- www/app/pages/doc/outcomemoney.php | 120 +++++++ www/app/pages/doc/prodissue.php | 34 +- www/app/pages/doc/prodreceipt.php | 36 +-- www/app/pages/doc/retcustissue.php | 12 +- www/app/pages/doc/returnissue.php | 25 +- www/app/pages/doc/serviceact.php | 37 ++- www/app/pages/doc/serviceorder.php | 8 +- www/app/pages/doc/task.php | 40 ++- www/app/pages/doc/transitem.php | 18 +- www/app/pages/doc/warranty.php | 14 +- www/app/pages/import.php | 2 +- www/app/pages/main.php | 8 +- www/app/pages/options.php | 12 +- www/app/pages/reference/categorylist.php | 14 +- www/app/pages/reference/customerlist.php | 8 +- www/app/pages/reference/eqlist.php | 43 ++- www/app/pages/reference/itemlist.php | 32 +- www/app/pages/reference/mflist.php | 18 +- www/app/pages/reference/prodarealist.php | 8 +- www/app/pages/reference/servicelist.php | 8 +- www/app/pages/reference/storelist.php | 6 +- www/app/pages/register/doclist.php | 14 +- www/app/pages/register/gilist.php | 26 +- www/app/pages/register/grlist.php | 36 +-- www/app/pages/register/ordercustlist.php | 8 +- www/app/pages/register/orderlist.php | 4 +- www/app/pages/register/paylist.php | 199 ++++++++++++ www/app/pages/register/prodlist.php | 35 +- www/app/pages/register/stocklist.php | 99 +++--- www/app/pages/register/tasklist.php | 37 +-- www/app/pages/report/itemactivity.php | 26 +- www/app/pages/report/payactivity.php | 178 +++++++++++ www/app/pages/report/prod.php | 14 +- www/app/pages/users.php | 24 +- www/app/widgets/docview.php | 8 +- www/app/widgets/wdebitors.php | 10 +- www/app/widgets/wminqty.php | 5 +- www/app/widgets/wnoliq.php | 3 +- www/app/widgets/wplanneddocs.php | 4 +- www/app/widgets/wrdoc.php | 30 +- www/app/widgets/wsdate.php | 39 ++- www/templates/index.html | 12 +- www/templates/modules/ocstore/items.html | 164 +++++----- www/templates/modules/ocstore/options.html | 86 ++--- www/templates/modules/ocstore/orders.html | 130 ++++---- www/templates/modules/shop/pages/base.html | 4 +- www/templates/pages/base.html | 88 +++--- www/templates/pages/doc/goodsissue.html | 43 +-- www/templates/pages/doc/goodsreceipt.html | 63 ++-- www/templates/pages/doc/incomemoney.html | 58 ++++ www/templates/pages/doc/moveitem.html | 8 +- www/templates/pages/doc/movemoney.html | 62 ++++ www/templates/pages/doc/outcomemoney.html | 58 ++++ www/templates/pages/doc/prodissue.html | 26 +- www/templates/pages/doc/prodreceipt.html | 46 +-- www/templates/pages/doc/retcustissue.html | 22 +- www/templates/pages/doc/returnissue.html | 39 ++- www/templates/pages/doc/serviceact.html | 15 +- www/templates/pages/doc/task.html | 13 +- www/templates/pages/main.html | 12 +- www/templates/pages/options.html | 11 +- .../pages/reference/customerlist.html | 16 +- www/templates/pages/reference/eqlist.html | 22 +- www/templates/pages/reference/itemlist.html | 8 +- www/templates/pages/reference/mflist.html | 2 +- www/templates/pages/register/doclist.html | 18 +- www/templates/pages/register/gilist.html | 4 +- www/templates/pages/register/grlist.html | 12 +- .../pages/register/ordercustlist.html | 2 +- www/templates/pages/register/orderlist.html | 2 +- www/templates/pages/register/paylist.html | 100 ++++++ www/templates/pages/register/prodlist.html | 28 +- www/templates/pages/register/stocklist.html | 44 +-- www/templates/pages/report/itemactivity.html | 2 +- www/templates/pages/report/payactivity.html | 47 +++ www/templates/pages/report/prod.html | 4 +- www/templates/pages/userlogin.html | 86 ++--- www/templates/pages/users.html | 16 +- www/templates/printforms/goodsissue.tpl | 4 +- www/templates/printforms/incomemoney.tpl | 31 ++ www/templates/printforms/movemoney.tpl | 30 ++ www/templates/printforms/order.tpl | 2 +- www/templates/printforms/outcomemoney.tpl | 31 ++ www/templates/printforms/payactivity.tpl | 54 ++++ www/templates/printforms/prod.tpl | 8 +- www/templates/printforms/prodissue.tpl | 8 +- www/templates/printforms/prodreceipt.tpl | 8 +- www/templates/printforms/returnissue.tpl | 2 +- www/templates/printforms/serviceact.tpl | 12 +- www/templates/printforms/serviceorder.tpl | 6 +- www/templates/printforms/task.tpl | 4 +- www/templates/printforms/transitem.tpl | 14 +- www/templates/widgets/docview.html | 265 ++++++++-------- www/templates/widgets/wdebitors.html | 34 +- www/templates/widgets/wminqty.html | 32 +- www/templates/widgets/wnoliq.html | 30 +- www/templates/widgets/wplanneddocs.html | 32 +- www/templates/widgets/wrdoc.html | 32 +- www/templates/widgets/wsdate.html | 40 +-- 148 files changed, 3244 insertions(+), 1835 deletions(-) create mode 100644 www/app/entity/doc/incomemoney.php create mode 100644 www/app/entity/doc/movemoney.php create mode 100644 www/app/entity/doc/outcomemoney.php create mode 100644 www/app/pages/doc/incomemoney.php create mode 100644 www/app/pages/doc/movemoney.php create mode 100644 www/app/pages/doc/outcomemoney.php create mode 100644 www/app/pages/register/paylist.php create mode 100644 www/app/pages/report/payactivity.php create mode 100644 www/templates/pages/doc/incomemoney.html create mode 100644 www/templates/pages/doc/movemoney.html create mode 100644 www/templates/pages/doc/outcomemoney.html create mode 100644 www/templates/pages/register/paylist.html create mode 100644 www/templates/pages/report/payactivity.html create mode 100644 www/templates/printforms/incomemoney.tpl create mode 100644 www/templates/printforms/movemoney.tpl create mode 100644 www/templates/printforms/outcomemoney.tpl create mode 100644 www/templates/printforms/payactivity.tpl diff --git a/www/app/acl.php b/www/app/acl.php index bc8056b3b..10a401bb3 100644 --- a/www/app/acl.php +++ b/www/app/acl.php @@ -101,8 +101,6 @@ public static function checkShowReg($reg) { return false; } - - //проверка на доступ к документу public static function checkShowDoc($doc, $inreg = false) { $user = System::getUser(); diff --git a/www/app/application.php b/www/app/application.php index 96f88b1f9..4626550f8 100644 --- a/www/app/application.php +++ b/www/app/application.php @@ -128,6 +128,4 @@ public function Route($uri) { } } - - } diff --git a/www/app/entity/category.php b/www/app/entity/category.php index 1c248e6a7..5b0f900c4 100644 --- a/www/app/entity/category.php +++ b/www/app/entity/category.php @@ -13,12 +13,13 @@ class Category extends \ZCL\DB\Entity { protected function init() { $this->cat_id = 0; } - + protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); $sql = " select count(*) from items where cat_id = {$this->cat_id}"; $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? "Категория используется в товарах" : ""; + return ($cnt > 0) ? "Категория используется в товарах" : ""; } + } diff --git a/www/app/entity/customer.php b/www/app/entity/customer.php index 465ba920a..58b9aabb0 100644 --- a/www/app/entity/customer.php +++ b/www/app/entity/customer.php @@ -54,7 +54,6 @@ public function beforeDelete() { if ($cnt > 0) return "На контрагента есть ссылки в документах"; return ""; - } /** diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index 96cd8a47a..1f2cc5410 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -5,7 +5,6 @@ use \App\System; use \App\Helper; - /** * Класс-сущность документ * @@ -16,20 +15,18 @@ class Document extends \ZCL\DB\Entity { const STATE_NEW = 1; //Новый const STATE_EDITED = 2; //Отредактирован const STATE_CANCELED = 3; //Отменен - const STATE_EXECUTED = 5; // Проведен, выполнен + const STATE_EXECUTED = 5; // Проведен const STATE_APPROVED = 4; // Утвержден const STATE_DELETED = 6; // Удален const STATE_INPROCESS = 7; // в работе const STATE_WA = 8; // ждет подтверждения const STATE_CLOSED = 9; // Закрыт , доставлен, выполнен - const STATE_WP = 10; // Ждет оплату const STATE_INSHIPMENT = 11; // Отгружен - const STATE_PAYED = 12; // оплачен - const STATE_PART_PAYED = 13; // частично оплачен const STATE_DELIVERED = 14; // доставлен const STATE_REFUSED = 15; // отклонен const STATE_SHIFTED = 16; // отложен const STATE_FAIL = 17; // Аннулирован + const STATE_DONE = 18; // Закончен // типы экспорта const EX_WORD = 1; // Word const EX_EXCEL = 2; // Excel @@ -52,14 +49,14 @@ class Document extends \ZCL\DB\Entity { public $detaildata = array(); /** - * начальная инициализация. Вызывается автоматически в конструкторе Entity - * - */ + * начальная инициализация. Вызывается автоматически в конструкторе Entity + * + */ protected function init() { $this->document_id = 0; $this->state = 0; $this->customer_id = 0; - $this->datatag = 0; + $this->document_number = ''; $this->notes = ''; @@ -68,15 +65,15 @@ protected function init() { $this->basedoc = ''; $this->headerdata = array(); - - // $this->headerdata['inshipment'] = 0; //товары в пути + $this->detaildata = array(); + $this->headerdata['planned'] = 0; //запланированный } /** - * возвращает метаданные чтобы работало в дочерних классах - * - */ + * возвращает метаданные чтобы работало в дочерних классах + * + */ protected static function getMetadata() { return array('table' => 'documents', 'view' => 'documents_view', 'keyfield' => 'document_id'); } @@ -152,7 +149,6 @@ private function packData() { $this->content .= ""; } $this->content .= " "; - } /** @@ -184,7 +180,6 @@ private function unpackData() { } $this->detaildata[] = $_row; } - } /** @@ -200,11 +195,7 @@ public function generateReport() { * */ public function Execute() { - - if (trim(get_class($this), "\\") == 'App\Entity\Doc\Document') { - //если екземпляр базового типа Document приводим к дочернему типу - $this->cast()->Execute(); - } + } /** @@ -214,16 +205,28 @@ public function Execute() { protected function Cancel() { $conn = \ZDB\DB::getConnect(); $conn->StartTrans(); - // если метод не переопределен в наследнике удаляем документ со всех движений - $conn->Execute("delete from entrylist where document_id =" . $this->document_id); - //удаляем освободившиеся стоки - $conn->Execute("delete from store_stock where stock_id not in (select stock_id from entrylist) "); - //удаляем оплаты - $conn->Execute("delete from paylist where document_id =" . $this->document_id); - - - $conn->CompleteTrans(); - + try { + // если метод не переопределен в наследнике удаляем документ со всех движений + $conn->Execute("delete from entrylist where document_id =" . $this->document_id); + //удаляем освободившиеся стоки + $conn->Execute("delete from store_stock where stock_id not in (select stock_id from entrylist) "); + + //удаляем оплату + if ($this->headerdata['payment'] > 0) { + $conn->Execute("delete from paylist where document_id =" . $this->document_id); + $this->payamount = 0; + } + + $conn->CompleteTrans(); + } catch (\Exception $ee) { + global $logger; + $conn->RollbackTrans(); + \App\System::setErrorMsg($ee->getMessage()); + + $logger->error($ee->getMessage() . " Документ " . $this->_doc->meta_desc); + + return false; + } return true; } @@ -260,7 +263,6 @@ public function cast() { return $doc; } - protected function afterSave($update) { // if ($update == false) { //новый документ @@ -327,6 +329,7 @@ public function updateStatus($state) { $this->state = $state; $this->insertLog($state); + $this->save(); // $conn = \ZDB\DB::getConnect(); @@ -367,10 +370,8 @@ public static function getStateName($state) { return "Ожидает утверждения"; case Document::STATE_INSHIPMENT: return "В доставке"; - case Document::STATE_PAYED: - return "Оплачен"; - case Document::STATE_PART_PAYED: - return "Частично оплачен"; + case Document::STATE_DONE: + return "Выполнен"; case Document::STATE_DELIVERED: return "Доставлен"; case Document::STATE_REFUSED: @@ -388,7 +389,8 @@ public static function getStateName($state) { /** * Возвращает следующий номер при автонумерации - * + * + * @return mixed */ public function nextNumber() { @@ -396,8 +398,13 @@ public function nextNumber() { $class = explode("\\", get_called_class()); $metaname = $class[count($class) - 1]; $doc = Document::getFirst("meta_name='" . $metaname . "'", "document_id desc"); - if ($doc == null) - return ''; + if ($doc == null) { + // $doc = Document::getFirst("", "document_id desc"); + // $id=$doc->document_id ; + return "D" . substr('' . time(), 2); + } + + $prevnumber = $doc->document_number; if (strlen($prevnumber) == 0) return ''; @@ -474,67 +481,65 @@ public static function search($type, $from, $to, $header = array()) { return Document::find($where); } - /** - * @see \ZDB\Entity - * - */ + * @see \ZDB\Entity + * + */ protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); $cnt = $conn->GetOne("select count(*) from entrylist where document_id = {$this->document_id} "); if ($cnt > 0) { - + return "У документа есть записи в аналитике"; } $cnt = $conn->GetOne("select count(*) from paylist where document_id = {$this->document_id} "); if ($cnt > 0) { - + return "У документа есть оплаты"; } $cnt = $conn->GetOne("select count(*) from docrel where doc1 = {$this->document_id} or doc2 = {$this->document_id}"); if ($cnt > 0) { - + return "Есть связаные документы, удалите связи"; } - $f = $this->checkStates(array(Document::STATE_PAYED, Document::STATE_PART_PAYED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); + $f = $this->checkStates(array(Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); if ($f) { - - return "У документа были оплаты или доставки"; + + return "У документа были отправки или доставки"; } return ""; } + /** - * @see \ZDB\Entity - * - */ + * @see \ZDB\Entity + * + */ protected function afterDelete() { $conn = \ZDB\DB::getConnect(); - $conn->Execute("delete from docstatelog where document_id=".$this->document_id); - $conn->Execute("delete from paylist where document_id=".$this->document_id); - - } - + $conn->Execute("delete from docstatelog where document_id=" . $this->document_id); + $conn->Execute("delete from paylist where document_id=" . $this->document_id); + } /** * может быть отменен * */ public function canCanceled() { - $f = $this->checkStates(array(Document::STATE_CLOSED, Document::STATE_PAYED, Document::STATE_PART_PAYED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); + $f = $this->checkStates(array(Document::STATE_CLOSED, Document::STATE_INSHIPMENT, Document::STATE_DELIVERED)); if ($f) { - System::setWarnMsg("У документа были оплаты или доставки"); + System::setWarnMsg("У документа были отправки или доставки"); return true; } return true; } - + /** * * запись состояния в лог документа @@ -544,8 +549,8 @@ public function insertLog($state) { $conn = \ZDB\DB::getConnect(); $host = $conn->qstr($_SERVER["REMOTE_ADDR"]); $user = \App\System::getUser(); - - $sql="insert into docstatelog (document_id,user_id,createdon,docstate,hostname) values({$this->document_id},{$user->user_id},now(),{$state},{$host})"; + + $sql = "insert into docstatelog (document_id,user_id,createdon,docstate,hostname) values({$this->document_id},{$user->user_id},now(),{$state},{$host})"; $conn->Execute($sql); } @@ -557,11 +562,11 @@ public function getLogList() { $conn = \ZDB\DB::getConnect(); $rc = $conn->Execute("select * from docstatelog_view where document_id={$this->document_id} order by log_id"); $states = array(); - foreach($rc as $row){ - $row['createdon']=strtotime($row['createdon']); - $states[] = new \App\DataItem($row); + foreach ($rc as $row) { + $row['createdon'] = strtotime($row['createdon']); + $states[] = new \App\DataItem($row); } - + return $states; } @@ -571,50 +576,13 @@ public function getLogList() { * @param mixed $states */ public function checkStates(array $states) { - if(count($states)==0) return false; + if (count($states) == 0) + return false; $conn = \ZDB\DB::getConnect(); - $states = implode(',',$states) ; - + $states = implode(',', $states); + $cnt = $conn->getOne("select count(*) from docstatelog where docstate in({$states}) and document_id={$this->document_id}"); return $cnt > 0; } - /** - * Добавляет платеж - * - * @param mixed $amount сумма - * @param mixed $mf денежный счет - * @param mixed $comment коментарий - */ - public function addPayment( $amount, $mf,$comment = '') { - if(0==(int)$amount || 0==(int)$this->document_id || 0== $mf) return; - $pay = new \App\Entity\Pay(); - $pay->mf_id = $mf; - $pay->document_id = $this->document_id; - $pay->amount = $amount; - $pay->notes = $comment; - - $pay->user_id = System::getUser()->user_id; - $pay->save(); - } - - - - //возвращает список оплат - public function getPayments() { - $list = \App\Entity\Pay::find("document_id=".$this->document_id,"mf_id"); - - return $list; - } - //возвращает сумму оплат по документу - public function getPaymentAmount() { - $conn = \ZDB\DB::getConnect(); - - $sql="select coalesce(sum(amount),0) from paylist where document_id=".$this->document_id; - return $conn->GetOne($sql); - - } - - - } diff --git a/www/app/entity/doc/goodsissue.php b/www/app/entity/doc/goodsissue.php index 6f6b2a150..c95414b2a 100644 --- a/www/app/entity/doc/goodsissue.php +++ b/www/app/entity/doc/goodsissue.php @@ -23,12 +23,12 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } - - + + $detail[] = array("no" => $i++, "tovar_name" => $name, "tovar_code" => $value['item_code'], @@ -71,7 +71,7 @@ public function generateReport() { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); + foreach ($this->detaildata as $row) { @@ -82,8 +82,11 @@ public function Execute() { $sc->setCustomer($this->customer_id); $sc->save(); } + if ($this->headerdata['payment'] > 0) { + \App\Entity\Pay::addPayment($this->document_id, $this->amount, $this->headerdata['payment'], $this->headerdata['paynotes']); + $this->payamount = $this->amount; + } - $conn->CompleteTrans(); return true; } diff --git a/www/app/entity/doc/goodsreceipt.php b/www/app/entity/doc/goodsreceipt.php index 342991b93..2ac7d482d 100644 --- a/www/app/entity/doc/goodsreceipt.php +++ b/www/app/entity/doc/goodsreceipt.php @@ -18,12 +18,12 @@ public function generateReport() { $detail = array(); foreach ($this->detaildata as $value) { - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } - - + + $detail[] = array("no" => $i++, "itemname" => $name, "itemcode" => $value['item_code'], @@ -55,8 +55,8 @@ public function Execute() { //аналитика foreach ($this->detaildata as $row) { - $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'],$row['sdate'], true); - + $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'], $row['snumber'], $row['sdate'], true); + $sc = new Entry($this->document_id, $row['amount'], $row['quantity']); $sc->setStock($stock->stock_id); @@ -75,8 +75,11 @@ public function Execute() { $it->save(); } } + if ($this->headerdata['payment'] > 0) { + \App\Entity\Pay::addPayment($this->document_id, $this->amount, $this->headerdata['payment'], $this->headerdata['paynotes']); + $this->payamount = $this->amount; + } - return true; } diff --git a/www/app/entity/doc/incomemoney.php b/www/app/entity/doc/incomemoney.php new file mode 100644 index 000000000..11f9b2d00 --- /dev/null +++ b/www/app/entity/doc/incomemoney.php @@ -0,0 +1,41 @@ +document_id, $this->amount, $this->headerdata['mfto'], notes); + + + return true; + } + + public function generateReport() { + + + $header = array( + 'amount' => $this->amount, + 'date' => date('d.m.Y', $this->document_date), + "notes" => $this->notes, + "to" => $this->headerdata["mftoname"], + "document_number" => $this->document_number + ); + $report = new \App\Report('incomemoney.tpl'); + + $html = $report->generate($header); + + return $html; + } + +} diff --git a/www/app/entity/doc/moveitem.php b/www/app/entity/doc/moveitem.php index 2065d518d..96b5830fb 100644 --- a/www/app/entity/doc/moveitem.php +++ b/www/app/entity/doc/moveitem.php @@ -18,8 +18,6 @@ public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); - foreach ($this->detaildata as $value) { @@ -31,7 +29,7 @@ public function Execute() { $sc->save(); - $stockto = Stock::getStock($this->headerdata['storeto'], $value['item_id'], $value['partion'],$value['snumber'],$value['sdate'], true); + $stockto = Stock::getStock($this->headerdata['storeto'], $value['item_id'], $value['partion'], $value['snumber'], $value['sdate'], true); $sc = new Entry($this->document_id, $value['quantity'] * $value['partion'], $value['quantity']); $sc->setStock($stockto->stock_id); @@ -40,7 +38,7 @@ public function Execute() { } - $conn->CompleteTrans(); + return true; } @@ -53,11 +51,11 @@ public function generateReport() { $i = 1; $detail = array(); foreach ($this->detaildata as $value) { - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } - + $detail[] = array("no" => $i++, "item_name" => $name, "price" => $value['partion'], @@ -68,8 +66,8 @@ public function generateReport() { $header = array( "_detail" => $detail, 'date' => date('d.m.Y', $this->document_date), - "from" => Store::load($this->headerdata["storefrom"])->storename, - "to" => Store::load($this->headerdata["storeto"])->storename, + "from" => $this->headerdata["storefromname"], + "to" => $this->headerdata["storetoname"], "document_number" => $this->document_number ); $report = new \App\Report('moveitem.tpl'); diff --git a/www/app/entity/doc/movemoney.php b/www/app/entity/doc/movemoney.php new file mode 100644 index 000000000..5ba9ea904 --- /dev/null +++ b/www/app/entity/doc/movemoney.php @@ -0,0 +1,42 @@ +document_id, 0 - $this->amount, $this->headerdata['mffrom'], $this->notes); + Pay::addPayment($this->document_id, $this->amount, $this->headerdata['mfto'], notes); + + + return true; + } + + public function generateReport() { + + + $header = array( + 'amount' => $this->amount, + 'date' => date('d.m.Y', $this->document_date), + "from" => $this->headerdata["mffromname"], + "to" => $this->headerdata["mftoname"], + "document_number" => $this->document_number + ); + $report = new \App\Report('movemoney.tpl'); + + $html = $report->generate($header); + + return $html; + } + +} diff --git a/www/app/entity/doc/outcomemoney.php b/www/app/entity/doc/outcomemoney.php new file mode 100644 index 000000000..ddc5ea7a7 --- /dev/null +++ b/www/app/entity/doc/outcomemoney.php @@ -0,0 +1,41 @@ +document_id, 0 - $this->amount, $this->headerdata['mffrom'], notes); + + + return true; + } + + public function generateReport() { + + + $header = array( + 'amount' => $this->amount, + 'date' => date('d.m.Y', $this->document_date), + "notes" => $this->notes, + "from" => $this->headerdata["mffromname"], + "document_number" => $this->document_number + ); + $report = new \App\Report('outcomemoney.tpl'); + + $html = $report->generate($header); + + return $html; + } + +} diff --git a/www/app/entity/doc/prodissue.php b/www/app/entity/doc/prodissue.php index a34498bda..3816170e1 100644 --- a/www/app/entity/doc/prodissue.php +++ b/www/app/entity/doc/prodissue.php @@ -23,12 +23,12 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } - - + + $detail[] = array("no" => $i++, "tovar_name" => $name, "tovar_code" => $value['item_code'], @@ -62,7 +62,7 @@ public function generateReport() { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); + foreach ($this->detaildata as $row) { @@ -71,7 +71,7 @@ public function Execute() { $sc->save(); } - $conn->CompleteTrans(); + return true; } diff --git a/www/app/entity/doc/prodreceipt.php b/www/app/entity/doc/prodreceipt.php index 73d815861..44bc7e813 100644 --- a/www/app/entity/doc/prodreceipt.php +++ b/www/app/entity/doc/prodreceipt.php @@ -18,13 +18,13 @@ public function generateReport() { $detail = array(); foreach ($this->detaildata as $value) { - - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } - - + + $detail[] = array("no" => $i++, "itemname" => $name, "itemcode" => $value['item_code'], @@ -39,7 +39,7 @@ public function generateReport() { "_detail" => $detail, "document_number" => $this->document_number, "pareaname" => $this->headerdata["pareaname"], - "notes" => $this->notes, + "notes" => $this->notes, "total" => $this->amount ); @@ -57,7 +57,7 @@ public function Execute() { //аналитика foreach ($this->detaildata as $row) { - $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'],$row['snumber'],$row['sdate'], true); + $stock = \App\Entity\Stock::getStock($this->headerdata['store'], $row['item_id'], $row['price'], $row['snumber'], $row['sdate'], true); $sc = new Entry($this->document_id, $row['amount'], $row['quantity']); $sc->setStock($stock->stock_id); @@ -65,7 +65,7 @@ public function Execute() { $sc->save(); } - + return true; } diff --git a/www/app/entity/doc/retcustissue.php b/www/app/entity/doc/retcustissue.php index 74de4a953..707c5b1af 100644 --- a/www/app/entity/doc/retcustissue.php +++ b/www/app/entity/doc/retcustissue.php @@ -23,11 +23,11 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } - + $detail[] = array("no" => $i++, "tovar_name" => $name, "tovar_code" => $value['item_code'], @@ -60,7 +60,7 @@ public function generateReport() { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); + foreach ($this->detaildata as $row) { @@ -72,7 +72,7 @@ public function Execute() { $sc->save(); } - $conn->CompleteTrans(); + return true; } diff --git a/www/app/entity/doc/returnissue.php b/www/app/entity/doc/returnissue.php index 42592ab2c..56582747e 100644 --- a/www/app/entity/doc/returnissue.php +++ b/www/app/entity/doc/returnissue.php @@ -23,9 +23,9 @@ public function generateReport() { if (isset($detail[$value['item_id']])) { $detail[$value['item_id']]['quantity'] += $value['quantity']; } else { - $name =$value['itemname']; - if(strlen($value['snumber'])>0){ - $name .= ' ('.$value['snumber'].','.date('Y-m-d',$value['sdate']).')'; + $name = $value['itemname']; + if (strlen($value['snumber']) > 0) { + $name .= ' (' . $value['snumber'] . ',' . date('d.m.Y', $value['sdate']) . ')'; } $detail[] = array("no" => $i++, @@ -59,7 +59,7 @@ public function generateReport() { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); + foreach ($this->detaildata as $row) { @@ -71,8 +71,11 @@ public function Execute() { $sc->setCustomer($this->customer_id); $sc->save(); } + if ($this->headerdata['payment'] > 0) { + \App\Entity\Pay::addPayment($this->document_id, 0 - $this->amount, $this->headerdata['payment'], $this->headerdata['paynotes']); + $this->payamount = $this->amount; + } - $conn->CompleteTrans(); return true; } diff --git a/www/app/entity/doc/serviceact.php b/www/app/entity/doc/serviceact.php index 5220c1395..bc02c5db8 100644 --- a/www/app/entity/doc/serviceact.php +++ b/www/app/entity/doc/serviceact.php @@ -43,7 +43,7 @@ public function generateReport() { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); + foreach ($this->detaildata as $row) { @@ -55,7 +55,12 @@ public function Execute() { $sc->setCustomer($this->customer_id); $sc->save(); } - $conn->CompleteTrans(); + if ($this->headerdata['payment'] > 0) { + \App\Entity\Pay::addPayment($this->document_id, $this->amount, $this->headerdata['payment'], $this->headerdata['paynotes']); + $this->payamount = $this->amount; + } + + return true; } diff --git a/www/app/entity/doc/task.php b/www/app/entity/doc/task.php index ed97ba50f..b72902e56 100644 --- a/www/app/entity/doc/task.php +++ b/www/app/entity/doc/task.php @@ -88,7 +88,7 @@ public function generateReport() { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); + foreach ($this->detaildata as $row) { @@ -122,7 +122,10 @@ public function Execute() { } } - $conn->CompleteTrans(); + if ($this->headerdata['payment'] > 0) { + \App\Entity\Pay::addPayment($this->document_id, $this->amount, $this->headerdata['payment'], $this->headerdata['paynotes']); + $this->payamount = $this->amount; + } return true; } diff --git a/www/app/entity/doc/transitem.php b/www/app/entity/doc/transitem.php index 4e23f45b7..f5681ad4c 100644 --- a/www/app/entity/doc/transitem.php +++ b/www/app/entity/doc/transitem.php @@ -17,9 +17,6 @@ class TransItem extends Document { public function Execute() { $conn = \ZDB\DB::getConnect(); - $conn->StartTrans(); - - //списываем со склада @@ -32,14 +29,13 @@ public function Execute() { $ti = Item::load($this->headerdata['toitem']); $price = round(($this->amount ) / $this->headerdata["toquantity"]); - $stockto = Stock::getStock($this->headerdata['storefrom'], $ti->item_id, $price,"","", true); + $stockto = Stock::getStock($this->headerdata['storefrom'], $ti->item_id, $price, "", "", true); $sc = new Entry($this->document_id, $this->headerdata["toquantity"] * $price, $this->headerdata["toquantity"]); $sc->setStock($stockto->stock_id); $sc->save(); - $conn->CompleteTrans(); return true; } diff --git a/www/app/entity/employee.php b/www/app/entity/employee.php index 8ea00f799..9591d0db2 100644 --- a/www/app/entity/employee.php +++ b/www/app/entity/employee.php @@ -12,12 +12,14 @@ class Employee extends \ZCL\DB\Entity { protected function init() { $this->employee_id = 0; + $this->balance = 0; } protected function beforeSave() { parent::beforeSave(); //упаковываем данные в detail $this->detail = "{$this->login}"; + $this->detail .= "{$this->balance}"; $this->detail .= "{$this->email}"; $this->detail .= "{$this->comment}"; @@ -29,6 +31,7 @@ protected function beforeSave() { protected function afterLoad() { //распаковываем данные из detail $xml = simplexml_load_string($this->detail); + $this->balance = (int) ($xml->balance[0]); $this->login = (string) ($xml->login[0]); $this->email = (string) ($xml->email[0]); $this->comment = (string) ($xml->comment[0]); diff --git a/www/app/entity/equipment.php b/www/app/entity/equipment.php index 896e158e6..d4caaa9e6 100644 --- a/www/app/entity/equipment.php +++ b/www/app/entity/equipment.php @@ -43,6 +43,4 @@ protected function afterLoad() { parent::afterLoad(); } - - } diff --git a/www/app/entity/item.php b/www/app/entity/item.php index 1f20e6c3e..0c2cfe7a3 100644 --- a/www/app/entity/item.php +++ b/www/app/entity/item.php @@ -17,7 +17,6 @@ protected function init() { $this->curname = ''; $this->currate = 0; $this->price = 0; - } protected function afterLoad() { @@ -34,7 +33,7 @@ protected function afterLoad() { $this->currate = doubleval($xml->currate[0]); $this->pricelist = (int) $xml->pricelist[0]; $this->term = (int) $xml->term[0]; - + @@ -47,7 +46,7 @@ protected function beforeSave() { //упаковываем данные в detail $this->detail .= "{$this->pricelist}"; $this->detail .= "{$this->term}"; - + $this->detail .= "{$this->price1}"; $this->detail .= "{$this->price2}"; $this->detail .= "{$this->price3}"; @@ -70,8 +69,6 @@ protected function beforeDelete() { return ($cnt > 0) ? "ТМЦ уже используется" : ""; } - - //Вычисляет отпускную цену //$_price - цифра (заданая цена) или наименование цены из настроек //$partionprice - учетная цена diff --git a/www/app/entity/metadata.php b/www/app/entity/metadata.php index 91032c21e..b35dcd679 100644 --- a/www/app/entity/metadata.php +++ b/www/app/entity/metadata.php @@ -15,8 +15,6 @@ class MetaData extends \ZCL\DB\Entity { const METATYPE_REF = 3; const METATYPE_REG = 4; - - public static function getNames() { $list = array(); $list[1] = "Документ"; diff --git a/www/app/entity/moneyfund.php b/www/app/entity/moneyfund.php index bcf313f8b..31efe9585 100644 --- a/www/app/entity/moneyfund.php +++ b/www/app/entity/moneyfund.php @@ -13,9 +13,9 @@ class MoneyFund extends \ZCL\DB\Entity { protected function init() { $this->mf_id = 0; } - + protected function beforeDelete() { - + $conn = \ZDB\DB::getConnect(); $cnt = $conn->GetOne("select count(*) from paylist where mf_id = {$this->mf_id} "); @@ -24,18 +24,28 @@ protected function beforeDelete() { } return ""; } - + + /** + * возвращает баланс на денежных счетах + * + */ public static function Balance() { - + $conn = \ZDB\DB::getConnect(); $list = array(); $rc = $conn->Execute("select coalesce(sum(amount),0) as amount,mf_id from paylist group by mf_id "); - foreach($rc as $row){ - $list[$row["mf_id"]] = $row["amount"] ; + foreach ($rc as $row) { + $list[$row["mf_id"]] = $row["amount"]; } return $list; } - - - + + /** + * список счетов для комбо + * + */ + public static function getList() { + return MoneyFund::findArray("mf_name", ""); + } + } diff --git a/www/app/entity/pay.php b/www/app/entity/pay.php index 9415c6773..c5e46966d 100644 --- a/www/app/entity/pay.php +++ b/www/app/entity/pay.php @@ -15,9 +15,46 @@ protected function init() { $this->pl_id = 0; $this->paydate = time(); } - + protected function afterLoad() { $this->paydate = strtotime($this->paydate); - } -} \ No newline at end of file + + //возвращает список оплат + public static function getPayments($document_id) { + $list = Pay::find("document_id=" . $document_id, "mf_id"); + + return $list; + } + + //возвращает сумму оплат по документу + public static function getPaymentAmount($document_id) { + $conn = \ZDB\DB::getConnect(); + + $sql = "select coalesce(sum(amount),0) from paylist where document_id=" . $document_id; + return $conn->GetOne($sql); + } + + /** + * Добавляет платеж + * + * @param mixed $document_id документ + * @param mixed $amount сумма + * @param mixed $mf денежный счет + * @param mixed $comment коментарий + */ + public static function addPayment($document_id, $amount, $mf, $comment = '') { + if (0 == (int) $amount || 0 == (int) $document_id || 0 == $mf) + return; + $pay = new \App\Entity\Pay(); + $pay->mf_id = $mf; + $pay->document_id = $document_id; + $pay->amount = $amount; + $pay->notes = $comment; + + + $pay->user_id = \App\System::getUser()->user_id; + $pay->save(); + } + +} diff --git a/www/app/entity/prodarea.php b/www/app/entity/prodarea.php index fc0928c25..1da8bc05a 100644 --- a/www/app/entity/prodarea.php +++ b/www/app/entity/prodarea.php @@ -18,9 +18,8 @@ protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); // $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; - // $cnt = $conn->GetOne($sql); + // $cnt = $conn->GetOne($sql); return ($cnt > 0) ? "Нельзя удалять используемый склад" : true; } - - + } diff --git a/www/app/entity/service.php b/www/app/entity/service.php index 03c3c68fb..994ac8a6e 100644 --- a/www/app/entity/service.php +++ b/www/app/entity/service.php @@ -42,9 +42,9 @@ protected function beforeSave() { protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); - // $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; - // $cnt = $conn->GetOne($sql); + // $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; + // $cnt = $conn->GetOne($sql); return ($cnt > 0) ? "Нельзя удалять используемую услугу" : ""; } - + } diff --git a/www/app/entity/stock.php b/www/app/entity/stock.php index 9972aaf0b..0624adca9 100644 --- a/www/app/entity/stock.php +++ b/www/app/entity/stock.php @@ -13,13 +13,13 @@ class Stock extends \ZCL\DB\Entity { protected function init() { $this->stock_id = 0; - } + protected function afterLoad() { - if(strlen($this->sdate)>0) $this->sdate = strtotime($this->sdate); - + if (strlen($this->sdate) > 0) + $this->sdate = strtotime($this->sdate); } - + /** * Метод для получения имени ТМЦ с ценой для выпадающих списков * @@ -30,18 +30,18 @@ protected function afterLoad() { public static function findArrayAC($store, $partname = "") { - $criteria = "qty <> 0 and disabled <> 1 and store_id=".$store; + $criteria = "qty <> 0 and disabled <> 1 and store_id=" . $store; if (strlen($partname) > 0) { $partname = self::qstr('%' . $partname . '%'); $criteria .= " and (itemname like {$partname} or item_code like {$partname} or snumber like {$partname} )"; } - + $entitylist = self::find($criteria, "sdate asc"); $list = array(); foreach ($entitylist as $key => $value) { - if(strlen($value->snumber)>0){ - $value->itemname .= ' (' .$value->snumber.','. date('Y-m-d',$value->sdate). ')' ; + if (strlen($value->snumber) > 0) { + $value->itemname .= ' (' . $value->snumber . ',' . date('Y-m-d', $value->sdate) . ')'; } $list[$key] = $value->itemname . ', ' . \App\Helper::fqty($value->partion); } @@ -57,15 +57,15 @@ public static function findArrayAC($store, $partname = "") { * @param mixed $price Цена * @param mixed $create Создать если не существует */ - public static function getStock($store_id, $item_id, $price,$snumber="",$sdate=0, $create = false) { + public static function getStock($store_id, $item_id, $price, $snumber = "", $sdate = 0, $create = false) { $conn = \ZDB\DB::getConnect(); - + $where = "store_id = {$store_id} and item_id = {$item_id} and partion = {$price} "; - + if (strlen($snumber) > 0) { - - $where .= " and snumber = ".self::qstr($snumber ); - } + + $where .= " and snumber = " . self::qstr($snumber); + } //на случай если удален //$conn->Execute("update store_stock set deleted=0 where " . $where); @@ -77,7 +77,8 @@ public static function getStock($store_id, $item_id, $price,$snumber="",$sdate=0 $stock->item_id = $item_id; $stock->partion = $price; $stock->snumber = $snumber; - if($sdate >0)$stock->sdate = $sdate; + if ($sdate > 0) + $stock->sdate = $sdate; $stock->save(); } diff --git a/www/app/entity/store.php b/www/app/entity/store.php index 7e41bd4bc..2b1d3fe96 100644 --- a/www/app/entity/store.php +++ b/www/app/entity/store.php @@ -18,8 +18,8 @@ protected function init() { protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); - $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; - $cnt = $conn->GetOne($sql); + $sql = " select count(*) from store_stock where store_id = {$this->store_id}"; + $cnt = $conn->GetOne($sql); return ($cnt > 0) ? "Нельзя удалять используемый склад" : true; } diff --git a/www/app/entity/user.php b/www/app/entity/user.php index 21d99841f..7345f6d19 100644 --- a/www/app/entity/user.php +++ b/www/app/entity/user.php @@ -92,8 +92,8 @@ protected function beforeSave() { protected function beforeDelete() { $conn = \ZDB\DB::getConnect(); - $sql = " select count(*) from documents where user_id = {$this->user_id}"; - $cnt = $conn->GetOne($sql); + $sql = " select count(*) from documents where user_id = {$this->user_id}"; + $cnt = $conn->GetOne($sql); return ($cnt > 0) ? "Нельзя удалять пользователя с документами" : true; } diff --git a/www/app/helper.php b/www/app/helper.php index b561c37fb..bf4a51dc5 100644 --- a/www/app/helper.php +++ b/www/app/helper.php @@ -90,7 +90,6 @@ public static function generateMenu($meta_type) { case 4 : $dir = "Pages/Reference"; break; - } $textmenu = ""; @@ -143,7 +142,6 @@ public static function generateSmartMenu() { case 4 : $dir = "Pages/Reference"; break; - } $textmenu .= " {$item['description']} "; @@ -333,10 +331,30 @@ public static function getDefStore() { return $common['defstore']; } - \App\System::setErrorMsg('Не настроен склад по умолчанию'); - \App\Application::RedirectHome(); + \App\System::setErrorMsg('Не задан склад по умолчанию'); + \App\Application::Redirect("\\App\\Pages\\Options"); } + /** + * Возвращает расчетный счет по умолчанию + * + */ + public static function getDefMF() { + $common = System::getOptions("common"); + if ($common['defmf'] > 0) { + return $common['defmf']; + } + + \App\System::setErrorMsg('Не задан денежный счет по умолчанию'); + \App\Application::Redirect("\\App\\Pages\\Options"); + } + + /** + * Форматирование количества + * + * @param mixed $qty + * @return mixed + */ public static function fqty($qty) { if (strlen($qty) == 0) return ''; diff --git a/www/app/modules/ocstore/helper.php b/www/app/modules/ocstore/helper.php index 57d00813f..ce9e84821 100644 --- a/www/app/modules/ocstore/helper.php +++ b/www/app/modules/ocstore/helper.php @@ -5,11 +5,9 @@ /** * Вспомагательный класс */ -class Helper -{ +class Helper { - public static function do_curl_request($url, $params = array()) - { + public static function do_curl_request($url, $params = array()) { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); @@ -29,14 +27,15 @@ public static function do_curl_request($url, $params = array()) //execute post $result = curl_exec($ch); - if($result ===false){ - $error=curl_error($ch) ; - \App\System::setErrorMsg($error) ; + if ($result === false) { + $error = curl_error($ch); + \App\System::setErrorMsg($error); } - + //close connection curl_close($ch); return $result; } + } diff --git a/www/app/modules/ocstore/items.php b/www/app/modules/ocstore/items.php index 880b30084..6d542c178 100644 --- a/www/app/modules/ocstore/items.php +++ b/www/app/modules/ocstore/items.php @@ -1,5 +1,4 @@ modules, 'ocstore') === false && System::getUser()->userlogin != 'admin') { @@ -37,216 +34,217 @@ public function __construct() $cats = array(); $this->setWarn('Выполните соединение на странице настроек'); } - + $this->add(new Form('filter'))->onSubmit($this, 'filterOnSubmit'); - + $this->add(new Form('exportform'))->onSubmit($this, 'exportOnSubmit'); - + $this->exportform->add(new DataView('newitemlist', new ArrayDataSource(new Prop($this, '_items')), $this, 'itemOnRow')); $this->exportform->add(new DropDownChoice('ecat', $cats, 0)); - + $this->add(new ClickLink('updateqty'))->onClick($this, 'onUpdateQty'); $this->add(new ClickLink('updateprice'))->onClick($this, 'onUpdatePrice'); $this->add(new ClickLink('getitems'))->onClick($this, 'onGetItems'); - - } - - public function filterOnSubmit($sender) - { + } + + public function filterOnSubmit($sender) { $this->_items = array(); $modules = System::getOptions("modules"); - + $url = $modules['ocsite'] . '/index.php?route=api/zstore/articles&' . System::getSession()->octoken; - $json = Helper::do_curl_request($url ); - if($json ===false) return; - $data = json_decode($json,true); + $json = Helper::do_curl_request($url); + if ($json === false) + return; + $data = json_decode($json, true); if ($data['error'] == "") { - - $items = Item::find ("disabled <> 1","itemname"); - foreach($items as $item){ - if(strlen($item->item_code)==0) continue; - if(in_array($item->item_code,$data['articles'])) continue; //уже в магазине - if(strlen($item->qty)==0)$item->qty=0; + + $items = Item::find("disabled <> 1", "itemname"); + foreach ($items as $item) { + if (strlen($item->item_code) == 0) + continue; + if (in_array($item->item_code, $data['articles'])) + continue; //уже в магазине + if (strlen($item->qty) == 0) + $item->qty = 0; $this->_items[] = $item; - } - - $this->exportform->newitemlist->Reload(); + } + + $this->exportform->newitemlist->Reload(); $this->exportform->ecat->setValue(0); - } else { $this->setError($data['error']); - } - } - - - public function itemOnRow($row) - { + } + } + + public function itemOnRow($row) { $modules = System::getOptions("modules"); - + $item = $row->getDataItem(); - $row->add(new CheckBox('ch', new Prop($item,'ch') )); + $row->add(new CheckBox('ch', new Prop($item, 'ch'))); $row->add(new Label('name', $item->itemname)); $row->add(new Label('code', $item->item_code)); $row->add(new Label('qty', \App\Helper::fqty($item->qty))); $row->add(new Label('price', $item->getPrice($modules['ocpricetype']))); $row->add(new Label('desc', $item->desription)); - - } - + public function exportOnSubmit($sender) { - $modules = System::getOptions("modules"); - $cat=$this->exportform->ecat->getValue(); - if($cat==0) { - $this->setError('Не выбрана категория '); - return; - } - - $elist = array(); - foreach($this->_items as $item) { - if($item->ch == false)continue; - $elist[] = array('name'=>$item->itemname, - 'description'=>$item->description, - 'sku'=>$item->item_code, - 'quantity'=>\App\Helper::fqty($item->qty), - 'price'=>$item->getPrice($modules['ocpricetype']) - ); - } - if(count($elist)==0) { - $this->setError('Не выбран ни один товар'); - return; - } - $data= json_encode($elist); - - + $modules = System::getOptions("modules"); + $cat = $this->exportform->ecat->getValue(); + if ($cat == 0) { + $this->setError('Не выбрана категория '); + return; + } + + $elist = array(); + foreach ($this->_items as $item) { + if ($item->ch == false) + continue; + $elist[] = array('name' => $item->itemname, + 'description' => $item->description, + 'sku' => $item->item_code, + 'quantity' => \App\Helper::fqty($item->qty), + 'price' => $item->getPrice($modules['ocpricetype']) + ); + } + if (count($elist) == 0) { + $this->setError('Не выбран ни один товар'); + return; + } + $data = json_encode($elist); + + $fields = array( 'data' => $data, - 'cat' => $cat + 'cat' => $cat ); - + $url = $modules['ocsite'] . '/index.php?route=api/zstore/addproducts&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, $fields); - if($json ===false) return; - $data = json_decode($json,true); - - + if ($json === false) + return; + $data = json_decode($json, true); + + if ($data['error'] != "") { $this->setError($data['error']); return; } - $this->setSuccess("Экспортировано ".count($elist)." товаров"); - + $this->setSuccess("Экспортировано " . count($elist) . " товаров"); + //обновляем таблицу - $this->filterOnSubmit(null); + $this->filterOnSubmit(null); + } - } - public function onUpdateQty($sender) { - $modules = System::getOptions("modules"); - - - $elist = array(); - $items = Item::find ("disabled <> 1 "); - foreach($items as $item){ - if(strlen($item->item_code)==0)continue; - if(strlen($item->qty)==0)$item->qty=0; - $elist[$item->item_code] = $item->qty; - } - - $data= json_encode($elist) ; - + $modules = System::getOptions("modules"); + + + $elist = array(); + $items = Item::find("disabled <> 1 "); + foreach ($items as $item) { + if (strlen($item->item_code) == 0) + continue; + if (strlen($item->qty) == 0) + $item->qty = 0; + $elist[$item->item_code] = $item->qty; + } + + $data = json_encode($elist); + $fields = array( 'data' => $data ); $url = $modules['ocsite'] . '/index.php?route=api/zstore/updatequantity&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, $fields); - if($json ===false) return; - $data = json_decode($json,true); - + if ($json === false) + return; + $data = json_decode($json, true); + if ($data['error'] != "") { $this->setError($data['error']); return; } - $this->setSuccess("Обновлено "); - - - - - } - - + $this->setSuccess("Обновлено "); + } + public function onUpdatePrice($sender) { - $modules = System::getOptions("modules"); - - - $elist = array(); - $items = Item::find ("disabled <> 1 "); - foreach($items as $item){ - if(strlen($item->item_code)==0)continue; - $elist[$item->item_code] = $item->getPrice($modules['ocpricetype']); - } - - $data= json_encode($elist) ; - + $modules = System::getOptions("modules"); + + + $elist = array(); + $items = Item::find("disabled <> 1 "); + foreach ($items as $item) { + if (strlen($item->item_code) == 0) + continue; + $elist[$item->item_code] = $item->getPrice($modules['ocpricetype']); + } + + $data = json_encode($elist); + $fields = array( 'data' => $data ); $url = $modules['ocsite'] . '/index.php?route=api/zstore/updateprice&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, $fields); - if($json ===false) return; - $data = json_decode($json,true); - + if ($json === false) + return; + $data = json_decode($json, true); + if ($data['error'] != "") { $this->setError($data['error']); return; } - $this->setSuccess("Обновлено "); - - - - - } - + $this->setSuccess("Обновлено "); + } + public function onGetItems($sender) { $modules = System::getOptions("modules"); - + $elist = array(); - + $url = $modules['ocsite'] . '/index.php?route=api/zstore/getproducts&' . System::getSession()->octoken; $json = Helper::do_curl_request($url); - if($json ===false) return; - $data = json_decode($json,true); - + if ($json === false) + return; + $data = json_decode($json, true); + if ($data['error'] != "") { $this->setError($data['error']); return; } - + $i = 0; - foreach($data['products'] as $product){ - - - $cnt = Item::findCnt("item_code=". Item::qstr($product['sku'])); - if($cnt >0) continue; //уже есть с таким аритикулом - + foreach ($data['products'] as $product) { + + + $cnt = Item::findCnt("item_code=" . Item::qstr($product['sku'])); + if ($cnt > 0) + continue; //уже есть с таким аритикулом + $item = new Item(); - $item->item_code= $product['sku']; - $item->itemname= $product['name']; - $item->description= $product['description']; - - if($modules['ocpricetype']=='price1')$item->price1= $product['price']; - if($modules['ocpricetype']=='price2')$item->price2= $product['price']; - if($modules['ocpricetype']=='price3')$item->price3= $product['price']; - if($modules['ocpricetype']=='price4')$item->price4= $product['price']; - if($modules['ocpricetype']=='price5')$item->price5= $product['price']; + $item->item_code = $product['sku']; + $item->itemname = $product['name']; + $item->description = $product['description']; + + if ($modules['ocpricetype'] == 'price1') + $item->price1 = $product['price']; + if ($modules['ocpricetype'] == 'price2') + $item->price2 = $product['price']; + if ($modules['ocpricetype'] == 'price3') + $item->price3 = $product['price']; + if ($modules['ocpricetype'] == 'price4') + $item->price4 = $product['price']; + if ($modules['ocpricetype'] == 'price5') + $item->price5 = $product['price']; $item->save(); $i++; } - - - - - $this->setSuccess("Загружено {$i} товаров") ; - - } + + + + + $this->setSuccess("Загружено {$i} товаров"); + } + } diff --git a/www/app/modules/ocstore/options.php b/www/app/modules/ocstore/options.php index 555b5c545..ea0f32fb5 100644 --- a/www/app/modules/ocstore/options.php +++ b/www/app/modules/ocstore/options.php @@ -10,11 +10,9 @@ use \Zippy\Html\Form\TextInput; use \Zippy\WebApplication as App; -class Options extends \App\Pages\Base -{ +class Options extends \App\Pages\Base { - public function __construct() - { + public function __construct() { parent::__construct(); if (strpos(System::getUser()->modules, 'ocstore') === false && System::getUser()->userlogin != 'admin') { @@ -30,16 +28,14 @@ public function __construct() $form->add(new TextInput('site', $modules['ocsite'])); $form->add(new TextInput('apiname', $modules['ocapiname'])); $form->add(new TextArea('key', $modules['ockey'])); - $form->add(new DropDownChoice('defcust', \App\Entity\Customer::getList(),$modules['occustomer_id'])); - $form->add(new DropDownChoice('defpricetype', \App\Entity\Item::getPriceTypeList(),$modules['ocpricetype'])); + $form->add(new DropDownChoice('defcust', \App\Entity\Customer::getList(), $modules['occustomer_id'])); + $form->add(new DropDownChoice('defpricetype', \App\Entity\Item::getPriceTypeList(), $modules['ocpricetype'])); $form->add(new SubmitButton('save'))->onClick($this, 'saveOnClick'); $form->add(new SubmitButton('check'))->onClick($this, 'checkOnClick'); - } - public function checkOnClick($sender) - { + public function checkOnClick($sender) { $site = $this->cform->site->getText(); $apiname = $this->cform->apiname->getText(); $key = $this->cform->key->getText(); @@ -49,18 +45,18 @@ public function checkOnClick($sender) $fields = array( 'username' => $apiname, - 'key' => $key - + 'key' => $key ); $json = Helper::do_curl_request($url, $fields); - if($json ===false) return; - $data = json_decode($json,true); + if ($json === false) + return; + $data = json_decode($json, true); - if (is_array($data['error']) ) { - $this->setError(implode(' ',$data['error'])); - } else + if (is_array($data['error'])) { + $this->setError(implode(' ', $data['error'])); + } else if (strlen($data['error']) > 0) { $this->setError($data['error']); } @@ -79,31 +75,29 @@ public function checkOnClick($sender) //загружаем список статусов $url = $site . '/index.php?route=api/zstore/statuses&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, array()); - $data = json_decode($json,true); + $data = json_decode($json, true); if ($data['error'] != "") { $this->setError($data['error']); } else { - + System::getSession()->statuses = $data['statuses']; } //загружаем список категорий $url = $site . '/index.php?route=api/zstore/cats&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, array()); - $data = json_decode($json,true); + $data = json_decode($json, true); if ($data['error'] != "") { $this->setError($data['error']); } else { - + System::getSession()->cats = $data['cats']; } - } } - public function saveOnClick($sender) - { + public function saveOnClick($sender) { $site = $this->cform->site->getText(); $apiname = $this->cform->apiname->getText(); $key = $this->cform->key->getText(); @@ -131,4 +125,5 @@ public function saveOnClick($sender) System::setOptions("modules", $modules); $this->setSuccess('Сохранено'); } + } diff --git a/www/app/modules/ocstore/orders.php b/www/app/modules/ocstore/orders.php index b3e10d72f..b563ebb69 100644 --- a/www/app/modules/ocstore/orders.php +++ b/www/app/modules/ocstore/orders.php @@ -15,14 +15,12 @@ use \App\Entity\Item; use \Zippy\Html\Link\ClickLink; -class Orders extends \App\Pages\Base -{ +class Orders extends \App\Pages\Base { public $_neworders = array(); public $_eorders = array(); - public function __construct() - { + public function __construct() { parent::__construct(); if (strpos(System::getUser()->modules, 'ocstore') === false && System::getUser()->userlogin != 'admin') { @@ -38,26 +36,24 @@ public function __construct() $statuses = array(); $this->setWarn('Выполните соединение на странице настроек'); } - + $this->add(new Form('filter'))->onSubmit($this, 'filterOnSubmit'); $this->filter->add(new DropDownChoice('status', $statuses, 0)); $this->add(new DataView('neworderslist', new ArrayDataSource(new Prop($this, '_neworders')), $this, 'noOnRow')); $this->add(new ClickLink('importbtn'))->onClick($this, 'onImport'); - - + + $this->add(new ClickLink('refreshbtn'))->onClick($this, 'onRefresh'); $this->add(new Form('updateform'))->onSubmit($this, 'exportOnSubmit'); $this->updateform->add(new DataView('orderslist', new ArrayDataSource(new Prop($this, '_eorders')), $this, 'expRow')); $this->updateform->add(new DropDownChoice('estatus', $statuses, 0)); - } - public function filterOnSubmit($sender) - { + public function filterOnSubmit($sender) { $modules = System::getOptions("modules"); - + $status = $this->filter->status->getValue(); $this->_neworders = array(); @@ -66,32 +62,33 @@ public function filterOnSubmit($sender) ); $url = $modules['ocsite'] . '/index.php?route=api/zstore/orders&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, $fields); - if($json ===false) return; - $data = json_decode($json,true); + if ($json === false) + return; + $data = json_decode($json, true); if ($data['error'] == "") { - - - + + + foreach ($data['orders'] as $ocorder) { - - //$ocorder =unserialize(base64_decode($o )) ; - - - $isorder = Document::findCnt("meta_name='Order' and content like '%{$ocorder['order_id']}%'"); - if ($isorder > 0) { //уже импортирован - continue; - } - foreach($ocorder['_products_'] as $product) { - $code = trim($product['sku']); - if($code == "") { - $this->setWarn("Не задан артикул товара '{$product['name']}' в заказе номер {$ocorder['order_id']} "); + + //$ocorder =unserialize(base64_decode($o )) ; + + + $isorder = Document::findCnt("meta_name='Order' and content like '%{$ocorder['order_id']}%'"); + if ($isorder > 0) { //уже импортирован + continue; + } + foreach ($ocorder['_products_'] as $product) { + $code = trim($product['sku']); + if ($code == "") { + $this->setWarn("Не задан артикул товара '{$product['name']}' в заказе номер {$ocorder['order_id']} "); } - } - - $order = new \App\DataItem($ocorder); - - - $this->_neworders[] = $order; + } + + $order = new \App\DataItem($ocorder); + + + $this->_neworders[] = $order; } $this->neworderslist->Reload(); @@ -100,134 +97,135 @@ public function filterOnSubmit($sender) } } - - public function noOnRow($row) - { + public function noOnRow($row) { $order = $row->getDataItem(); - - $row->add(new Label('number', $order->order_id)); - $row->add(new Label('customer', $order->firstname.' '.$order->lastname)); - $row->add(new Label('amount', round($order->total))); - $row->add(new Label('comment', $order->comment)); - $row->add(new Label('date', date('Y-m-d H:i',strtotime($order->date_modified)))); + + $row->add(new Label('number', $order->order_id)); + $row->add(new Label('customer', $order->firstname . ' ' . $order->lastname)); + $row->add(new Label('amount', round($order->total))); + $row->add(new Label('comment', $order->comment)); + $row->add(new Label('date', date('Y-m-d H:i', strtotime($order->date_modified)))); } - - public function onImport($sender) - { + + public function onImport($sender) { $modules = System::getOptions("modules"); - - $i=0; + + $i = 0; foreach ($this->_neworders as $shoporder) { - - $neworder = Document::create('Order'); + + $neworder = Document::create('Order'); $neworder->document_number = $neworder->nextNumber(); if (strlen($neworder->document_number) == 0) - $neworder->document_number = 'OC00001'; + $neworder->document_number = 'OC00001'; $neworder->customer_id = $modules['occustomer_id']; - + //товары - - foreach($shoporder->_products_ as $product) { + + foreach ($shoporder->_products_ as $product) { //ищем по артикулу - if(strlen($product['sku'])==0) continue; - $code = Item::qstr($product['sku']) ; - - $tovar = Item::getFirst('item_code='.$code) ; - if($code == "") { - $this->setWarn("Не найден товар с артикулом '{$product['name']}' в заказе номер {$shoporder['order_id']} "); - continue; - } - $tovar->quantity = $product['quantity'] ; - $tovar->price = round($product['price']) ; - $neworder->detaildata[] = $tovar->getData(); + if (strlen($product['sku']) == 0) + continue; + $code = Item::qstr($product['sku']); + + $tovar = Item::getFirst('item_code=' . $code); + if ($code == "") { + $this->setWarn("Не найден товар с артикулом '{$product['name']}' в заказе номер {$shoporder['order_id']} "); + continue; + } + $tovar->quantity = $product['quantity']; + $tovar->price = round($product['price']); + $neworder->detaildata[] = $tovar->getData(); } - - - $neworder->headerdata['ocorder']= $shoporder->order_id; - $neworder->headerdata['ocorderback'] = 0; - $neworder->headerdata['occlient'] .= $shoporder->firstname .' '.$shoporder->lastname ; - $neworder->amount= round($shoporder->total); + + + $neworder->headerdata['ocorder'] = $shoporder->order_id; + $neworder->headerdata['ocorderback'] = 0; + $neworder->headerdata['occlient'] .= $shoporder->firstname . ' ' . $shoporder->lastname; + $neworder->amount = round($shoporder->total); $neworder->notes = "OC номер:{$shoporder->order_id};"; - $neworder->notes .= " Клиент:".$shoporder->firstname .' '.$shoporder->lastname.";"; - if(strlen($shoporder->email) > 0) $neworder->notes .= " Email:".$shoporder->email.";"; - if(strlen($shoporder->telephone) > 0) $neworder->notes .= " Тел:".$shoporder->telephone.";"; - $neworder->notes .= " Адрес:".$shoporder->shipping_city.' '.$shoporder->shipping_address_1.";"; - $neworder->notes .= " Комментарий:".$shoporder->comment.";"; + $neworder->notes .= " Клиент:" . $shoporder->firstname . ' ' . $shoporder->lastname . ";"; + if (strlen($shoporder->email) > 0) + $neworder->notes .= " Email:" . $shoporder->email . ";"; + if (strlen($shoporder->telephone) > 0) + $neworder->notes .= " Тел:" . $shoporder->telephone . ";"; + $neworder->notes .= " Адрес:" . $shoporder->shipping_city . ' ' . $shoporder->shipping_address_1 . ";"; + $neworder->notes .= " Комментарий:" . $shoporder->comment . ";"; $neworder->save(); $neworder->updateStatus(Document::STATE_NEW); - + $i++; } $this->setInfo("Импортировано {$i} заказов"); - + $this->_neworders = array(); $this->neworderslist->Reload(); } - - + public function onRefresh($sender) { - - $this->_eorders = Document::find("meta_name='Order' and content like '%0%' and state <> ". Document::STATE_NEW); - $this->updateform->orderslist->Reload(); + + $this->_eorders = Document::find("meta_name='Order' and content like '%0%' and state <> " . Document::STATE_NEW); + $this->updateform->orderslist->Reload(); } - - - public function expRow($row){ + + public function expRow($row) { $order = $row->getDataItem(); - $row->add(new CheckBox('ch', new Prop($order,'ch') )); + $row->add(new CheckBox('ch', new Prop($order, 'ch'))); $row->add(new Label('number2', $order->document_number)); $row->add(new Label('number3', $order->headerdata['ocorder'])); $row->add(new Label('date2', date('Y-m-d', $order->document_date))); $row->add(new Label('amount2', $order->amount)); $row->add(new Label('customer2', $order->headerdata['occlient'])); $row->add(new Label('state', Document::getStateName($order->state))); - } - - public function exportOnSubmit($sender) { - $modules = System::getOptions("modules"); - - $st=$this->updateform->estatus->getValue(); - if($st==0) { - $this->setError('Не выбран статус'); - return; - } - $elist = array(); - foreach($this->_eorders as $order) { - if($order->ch == false)continue; - $elist[$order->headerdata['ocorder']] =$st; - } - if(count($elist)==0) { - $this->setError('Не выбран ни один ордер'); - return; - } - $data= json_encode($elist) ; - + + public function exportOnSubmit($sender) { + $modules = System::getOptions("modules"); + + $st = $this->updateform->estatus->getValue(); + if ($st == 0) { + $this->setError('Не выбран статус'); + return; + } + $elist = array(); + foreach ($this->_eorders as $order) { + if ($order->ch == false) + continue; + $elist[$order->headerdata['ocorder']] = $st; + } + if (count($elist) == 0) { + $this->setError('Не выбран ни один ордер'); + return; + } + $data = json_encode($elist); + $fields = array( 'data' => $data ); $url = $modules['ocsite'] . '/index.php?route=api/zstore/updateorder&' . System::getSession()->octoken; $json = Helper::do_curl_request($url, $fields); - if($json ===false) return; - $data = json_decode($json,true); - + if ($json === false) + return; + $data = json_decode($json, true); + if ($data['error'] != "") { $this->setError($data['error']); return; } - $this->setSuccess("Обновлено ".count($elist)." заказов"); - - - foreach($this->_eorders as $order) { - if($order->ch == false)continue; - $order->headerdata['ocorderback'] = 1; - $order->save(); - } - - - $this->_eorders = Document::find("meta_name='Order' and content like '%0%' and state <> ". Document::STATE_NEW); - $this->updateform->orderslist->Reload(); - } + $this->setSuccess("Обновлено " . count($elist) . " заказов"); + + + foreach ($this->_eorders as $order) { + if ($order->ch == false) + continue; + $order->headerdata['ocorderback'] = 1; + $order->save(); + } + + + $this->_eorders = Document::find("meta_name='Order' and content like '%0%' and state <> " . Document::STATE_NEW); + $this->updateform->orderslist->Reload(); + } + } diff --git a/www/app/modules/shop/entity/manufacturer.php b/www/app/modules/shop/entity/manufacturer.php index 25cb30ae7..45c598a0e 100644 --- a/www/app/modules/shop/entity/manufacturer.php +++ b/www/app/modules/shop/entity/manufacturer.php @@ -15,12 +15,10 @@ protected function init() { protected function beforeDelete() { - $conn = \ZDB\DB::getConnect(); + $conn = \ZDB\DB::getConnect(); $sql = " select count(*) from shop_products where manufacturer_id = {$this->manufacturer_id}"; $cnt = $conn->GetOne($sql); - return ($cnt > 0) ? "Производитель используется в товарах" : ""; + return ($cnt > 0) ? "Производитель используется в товарах" : ""; } - - } diff --git a/www/app/modules/shop/entity/product.php b/www/app/modules/shop/entity/product.php index ea349d318..47f44c533 100644 --- a/www/app/modules/shop/entity/product.php +++ b/www/app/modules/shop/entity/product.php @@ -93,20 +93,18 @@ protected function afterSave($update) { } protected function beforeDelete() { - + $conn = \ZDB\DB::getConnect(); $sql = " select count(*) from documents_view where meta_name='Order' and content like '%{$this->product_id}%' "; $cnt = $conn->GetOne($sql); return ($cnt > 0) ? "Товар уже использован в заказах" : ""; - - } public function afterDelete() { - + $conn = \ZCL\DB\DB::getConnect(); $conn->Execute("delete from shop_attributevalues where product_id=" . $this->product_id); - \App\Entity\Image::delete($this->image_id); + \App\Entity\Image::delete($this->image_id); } /** diff --git a/www/app/modules/shop/entity/productgroup.php b/www/app/modules/shop/entity/productgroup.php index d3795218c..07610f387 100644 --- a/www/app/modules/shop/entity/productgroup.php +++ b/www/app/modules/shop/entity/productgroup.php @@ -18,18 +18,14 @@ protected function init() { $this->mpath = ''; } - - protected function beforeDelete() { - + protected function beforeDelete() { + $conn = \ZDB\DB::getConnect(); $sql = " select count(*) from shop_products where group_id = {$this->group_id}"; $cnt = $conn->GetOne($sql); return ($cnt > 0) ? "Нельзя удалять используемую группу" : ""; + } - - } - - protected function afterDelete() { $conn = \ZCL\DB\DB::getConnect(); $conn->Execute("delete from shop_attributes where group_id =" . $this->group_id); diff --git a/www/app/modules/shop/pages/grouplist.php b/www/app/modules/shop/pages/grouplist.php index ebb0db344..858626f11 100644 --- a/www/app/modules/shop/pages/grouplist.php +++ b/www/app/modules/shop/pages/grouplist.php @@ -26,10 +26,10 @@ class GroupList extends \App\Pages\Base { public function __construct() { parent::__construct(); - - if(strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin'){ - System::setErrorMsg('Нет права доступа к этой странице'); - App::RedirectHome(); + + if (strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin') { + System::setErrorMsg('Нет права доступа к этой странице'); + App::RedirectHome(); return; } @@ -161,12 +161,12 @@ public function OnRenameGroup($sender) { } public function OnDelGroup($sender) { - - $del=ProductGroup::delete($this->group->group_id); - if(strlen($del) > 0){ + + $del = ProductGroup::delete($this->group->group_id); + if (strlen($del) > 0) { $this->setError($del); return; - } + } $this->group = null; $this->ReloadTree(); } diff --git a/www/app/modules/shop/pages/manufacturers.php b/www/app/modules/shop/pages/manufacturers.php index 52c3d81cf..3a35a7042 100644 --- a/www/app/modules/shop/pages/manufacturers.php +++ b/www/app/modules/shop/pages/manufacturers.php @@ -16,9 +16,9 @@ class Manufacturers extends \App\Pages\Base { public function __construct() { parent::__construct(); - if(strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin'){ - System::setErrorMsg('Нет права доступа к этой странице'); - App::RedirectHome(); + if (strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin') { + System::setErrorMsg('Нет права доступа к этой странице'); + App::RedirectHome(); return; } @@ -41,12 +41,12 @@ public function __construct() { public function OnDeleteClick($sender) { $item = $sender->getOwner()->getDataItem(); - - $del=Manufacturer::delete($item->manufacturer_id); - if(strlen($del) > 0){ + + $del = Manufacturer::delete($item->manufacturer_id); + if (strlen($del) > 0) { $this->setError($del); return; - } + } $this->list->manufacturerslist->Reload(); } diff --git a/www/app/modules/shop/pages/options.php b/www/app/modules/shop/pages/options.php index c1c864448..49c3df2c0 100644 --- a/www/app/modules/shop/pages/options.php +++ b/www/app/modules/shop/pages/options.php @@ -23,9 +23,9 @@ class Options extends \App\Pages\Base { public function __construct() { parent::__construct(); - if(strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin'){ - System::setErrorMsg('Нет права доступа к этой странице'); - App::RedirectHome(); + if (strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin') { + System::setErrorMsg('Нет права доступа к этой странице'); + App::RedirectHome(); return; } diff --git a/www/app/modules/shop/pages/productlist.php b/www/app/modules/shop/pages/productlist.php index 517f958df..f8cc83907 100644 --- a/www/app/modules/shop/pages/productlist.php +++ b/www/app/modules/shop/pages/productlist.php @@ -40,9 +40,9 @@ class ProductList extends \App\Pages\Base { public function __construct() { parent::__construct(); - if(strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin'){ - System::setErrorMsg('Нет права доступа к этой странице'); - App::RedirectHome(); + if (strpos(System::getUser()->modules, 'shop') === false && System::getUser()->userlogin != 'admin') { + System::setErrorMsg('Нет права доступа к этой странице'); + App::RedirectHome(); return; } @@ -310,12 +310,12 @@ public function bcancelOnClick($sender) { } public function bdeleteOnClick($sender) { - - $del=Product::delete($this->product->product_id); - if(strlen($del) > 0){ + + $del = Product::delete($this->product->product_id); + if (strlen($del) > 0) { $this->setError($del); return; - } + } $this->listpanel->plist->Reload(); $this->editpanel->setVisible(false); $this->listpanel->setVisible(true); diff --git a/www/app/pages/base.php b/www/app/pages/base.php index cff30324a..27dac54fb 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -58,14 +58,13 @@ public function __construct($params = null) { $this->_tvars["smart"] = Helper::generateSmartMenu(); $this->_tvars["picontent"] = $pi; - - - + + + $this->_tvars["shop"] = $_config['modules']['shop'] == 1; $this->_tvars["ocstore"] = $_config['modules']['ocstore'] == 1; //если включен хоть один модуль $this->_tvars["modules"] = $this->_tvars["shop"] || $this->_tvars["ocstore"]; - } public function LogoutClick($sender) { diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php index 32b8a2e6a..1ab013efd 100644 --- a/www/app/pages/doc/goodsissue.php +++ b/www/app/pages/doc/goodsissue.php @@ -19,6 +19,7 @@ use \App\Entity\Item; use \App\Entity\Stock; use \App\Entity\Store; +use \App\Entity\MoneyFund; use \App\Helper as H; use \App\System; use \App\Application as App; @@ -45,7 +46,9 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->add(new Date('sent_date')); $this->docform->add(new Date('delivery_date')); $this->docform->add(new CheckBox('planned')); - $this->docform->add(new CheckBox('payed')); + $this->docform->add(new DropDownChoice('payment', MoneyFund::getList(), H::getDefMF()))->onChange($this, "onMF"); + $this->docform->add(new TextInput('paynotes')); + $this->docform->add(new DropDownChoice('store', Store::getList(), H::getDefStore()))->onChange($this, 'OnChangeStore'); @@ -100,7 +103,7 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editcust->add(new SubmitButton('savecust'))->onClick($this, 'savecustOnClick'); if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->planned->setChecked($this->_doc->headerdata['planned']); @@ -113,6 +116,8 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->ship_address->setText($this->_doc->headerdata['ship_address']); $this->docform->emp->setValue($this->_doc->headerdata['emp_id']); $this->docform->delivery->setValue($this->_doc->headerdata['delivery']); + $this->docform->payment->setValue($this->_doc->headerdata['payment']); + $this->docform->paynotes->setText($this->_doc->headerdata['paynotes']); $this->docform->store->setValue($this->_doc->headerdata['store']); $this->docform->customer->setKey($this->_doc->customer_id); @@ -186,13 +191,18 @@ public function __construct($docid = 0, $basedocid = 0) { } } } - $this->calcTotal(); + $this->calcTotal(); $this->docform->add(new DataView('detail', new \Zippy\Html\DataList\ArrayDataSource(new \Zippy\Binding\PropertyBinding($this, '_tovarlist')), $this, 'detailOnRow'))->Reload(); if (false == \App\ACL::checkShowDoc($this->_doc)) return; - $this->docform->payed->setChecked($this->_doc->datatag == $this->_doc->amount); $this->calcTotal(); $this->OnDelivery($this->docform->delivery); + $this->onMF($this->docform->payment); + } + + public function onMF($sender) { + $mf = $sender->getValue(); + $this->docform->paynotes->setVisible($mf > 0); } public function detailOnRow($row) { @@ -203,7 +213,7 @@ public function detailOnRow($row) { $row->add(new Label('code', $item->item_code)); $row->add(new Label('msr', $item->msr)); $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); @@ -263,8 +273,8 @@ public function saverowOnClick($sender) { $stock = Stock::load($id); $stock->quantity = $this->editdetail->editquantity->getText(); - $qstock=$this->editdetail->qtystock->getText(); - if($stock->quantity > $qstock) { + $qstock = $this->editdetail->qtystock->getText(); + if ($stock->quantity > $qstock) { $this->setWarn('Недостаточное количество на складе'); } $stock->price = $this->editdetail->editprice->getText(); @@ -313,34 +323,32 @@ public function savedocOnClick($sender) { $order = Document::load($this->_order_id); $this->calcTotal(); - $old = $this->_doc->cast(); - - $this->_doc->headerdata['order'] = $this->docform->order->getText(); - $this->_doc->headerdata['ship_address'] = $this->docform->ship_address->getText(); - $this->_doc->headerdata['ship_number'] = $this->docform->ship_number->getText(); - $this->_doc->headerdata['delivery'] = $this->docform->delivery->getValue(); - $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - $this->_doc->headerdata['emp_id'] = $this->docform->emp->getValue(); - $this->_doc->headerdata['emp_name'] = $this->docform->emp->getValueName(); - $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); - $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); - $this->_doc->headerdata['delivery_date'] = $this->docform->delivery_date->getDate(); - $this->_doc->headerdata['sent_date'] = $this->docform->sent_date->getDate(); - $this->_doc->headerdata['order_id'] = $this->_order_id; - - + + + $this->_doc->headerdata['order'] = $this->docform->order->getText(); + $this->_doc->headerdata['ship_address'] = $this->docform->ship_address->getText(); + $this->_doc->headerdata['ship_number'] = $this->docform->ship_number->getText(); + $this->_doc->headerdata['delivery'] = $this->docform->delivery->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['emp_id'] = $this->docform->emp->getValue(); + $this->_doc->headerdata['emp_name'] = $this->docform->emp->getValueName(); + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); + $this->_doc->headerdata['delivery_date'] = $this->docform->delivery_date->getDate(); + $this->_doc->headerdata['sent_date'] = $this->docform->sent_date->getDate(); + $this->_doc->headerdata['order_id'] = $this->_order_id; + $this->_doc->headerdata['payment'] = $this->docform->payment->getValue(); + $this->_doc->headerdata['paynotes'] = $this->docform->paynotes->getText(); + + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); } $this->_doc->amount = $this->docform->total->getText(); - if ($this->docform->payed->isChecked() == true && $this->_doc->datatag < $this->_doc->amount) { - $this->_doc->addPayment(System::getUser()->user_id, $this->_doc->amount - $this->_doc->datatag); - $this->_doc->datatag = $this->_doc->amount; - } $isEdited = $this->_doc->document_id > 0; diff --git a/www/app/pages/doc/goodsreceipt.php b/www/app/pages/doc/goodsreceipt.php index a34cf8119..72cd2dc63 100644 --- a/www/app/pages/doc/goodsreceipt.php +++ b/www/app/pages/doc/goodsreceipt.php @@ -18,6 +18,7 @@ use \App\Entity\Doc\Document; use \App\Entity\Item; use \App\Entity\Store; +use \App\Entity\MoneyFund; use \App\Helper as H; use \App\System; use \App\Application as App; @@ -36,10 +37,8 @@ class GoodsReceipt extends \App\Pages\Base { public function __construct($docid = 0, $basedocid = 0) { parent::__construct(); - $common = System::getOptions("common"); - $this->add(new Form('docform')); $this->docform->add(new TextInput('document_number')); $this->docform->add(new Date('document_date'))->setDate(time()); @@ -48,14 +47,15 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->add(new DropDownChoice('store', Store::getList(), H::getDefStore())); $this->docform->add(new TextInput('notes')); $this->docform->add(new CheckBox('planned')); - $this->docform->add(new CheckBox('payed')); + + $this->docform->add(new DropDownChoice('payment', MoneyFund::getList(), H::getDefMF()))->onChange($this, "onMF"); + $this->docform->add(new TextInput('paynotes')); $this->docform->add(new DropDownChoice('val', array(1 => 'Гривна', 2 => 'Доллар', 3 => 'Евро', 4 => 'Рубль')))->onChange($this, "onVal", true); $this->docform->add(new Label('course', 'Курс 1')); $this->docform->val->setVisible($common['useval'] == true); $this->docform->course->setVisible($common['useval'] == true); - $this->docform->add(new SubmitLink('addrow'))->onClick($this, 'addrowOnClick'); $this->docform->add(new Button('backtolist'))->onClick($this, 'backtolistOnClick'); $this->docform->add(new SubmitButton('savedoc'))->onClick($this, 'savedocOnClick'); @@ -71,7 +71,6 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new TextInput('editsnumber')); $this->editdetail->add(new Date('editsdate')); - $this->editdetail->add(new Button('cancelrow'))->onClick($this, 'cancelrowOnClick'); $this->editdetail->add(new SubmitButton('saverow'))->onClick($this, 'saverowOnClick'); @@ -82,10 +81,8 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editnewitem->add(new Button('cancelnewitem'))->onClick($this, 'cancelnewitemOnClick'); $this->editnewitem->add(new SubmitButton('savenewitem'))->onClick($this, 'savenewitemOnClick'); - - if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->planned->setChecked($this->_doc->headerdata['planned']); @@ -96,6 +93,8 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->customer->setText($this->_doc->customer_name); $this->docform->store->setValue($this->_doc->headerdata['store']); + $this->docform->payment->setValue($this->_doc->headerdata['payment']); + $this->docform->paynotes->setText($this->_doc->headerdata['paynotes']); foreach ($this->_doc->detaildata as $item) { $item = new Item($item); @@ -138,17 +137,21 @@ public function __construct($docid = 0, $basedocid = 0) { $item = new Item($_item); $this->_itemlist[$item->item_id] = $item; } - } } } } - $this->calcTotal(); + $this->calcTotal(); $this->docform->add(new DataView('detail', new \Zippy\Html\DataList\ArrayDataSource(new \Zippy\Binding\PropertyBinding($this, '_itemlist')), $this, 'detailOnRow'))->Reload(); if (false == \App\ACL::checkShowDoc($this->_doc)) return; - $this->docform->payed->setChecked($this->_doc->datatag == $this->_doc->amount); + $this->onMF($this->docform->payment); + } + + public function onMF($sender) { + $mf = $sender->getValue(); + $this->docform->paynotes->setVisible($mf > 0); } public function onVal($sender) { @@ -170,14 +173,13 @@ public function onVal($sender) { public function detailOnRow($row) { $item = $row->getDataItem(); - $row->add(new Label('item', $item->itemname)); $row->add(new Label('code', $item->item_code)); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); $row->add(new Label('msr', $item->msr)); $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('amount', round($item->quantity * $item->price))); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); @@ -237,17 +239,17 @@ public function saverowOnClick($sender) { $item->quantity = $this->editdetail->editquantity->getText(); $item->price = $this->editdetail->editprice->getText(); - + if ($item->price == 0) { $this->setWarn("Не указана цена"); } $item->snumber = $this->editdetail->editsnumber->getText(); $item->sdate = $this->editdetail->editsdate->getDate(); - if($item->sdate == false)$item->sdate=''; - if(strlen($item->snumber)>0 && strlen($item->sdate )==0) { - $this->setError("К серии должна быть введена дата"); + if ($item->sdate == false) + $item->sdate = ''; + if (strlen($item->snumber) > 0 && strlen($item->sdate) == 0) { + $this->setError("К серии должна быть введена дата"); return; - } unset($this->_itemlist[$this->_rowid]); $this->_itemlist[$item->item_id] = $item; @@ -281,7 +283,7 @@ public function savedocOnClick($sender) { if ($this->checkForm() == false) { return; } - $old = $this->_doc->cast(); + $this->calcTotal(); $common = System::getOptions("common"); @@ -308,15 +310,16 @@ public function savedocOnClick($sender) { } } - - - $this->_doc->headerdata['order'] = $this->docform->order->getText(); - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; - - $this->_doc->headerdata['order_id'] = $this->_order_id; - - + + $this->_doc->headerdata['order'] = $this->docform->order->getText(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['payment'] = $this->docform->payment->getValue(); + $this->_doc->headerdata['paynotes'] = $this->docform->paynotes->getText(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + + $this->_doc->headerdata['order_id'] = $this->_order_id; + + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); @@ -326,14 +329,6 @@ public function savedocOnClick($sender) { $isEdited = $this->_doc->document_id > 0; - - if ($this->docform->payed->isChecked() == true && $this->_doc->datatag < $this->_doc->amount) { - - $this->_doc->addPayment(System::getUser()->getUserName(), $this->_doc->amount); - $this->_doc->datatag = $this->_doc->amount; - } - - $conn = \ZDB\DB::getConnect(); $conn->BeginTrans(); try { @@ -354,9 +349,6 @@ public function savedocOnClick($sender) { } - - - if ($this->_basedocid > 0) { $this->_doc->AddConnectedDoc($this->_basedocid); $this->_basedocid = 0; diff --git a/www/app/pages/doc/incomemoney.php b/www/app/pages/doc/incomemoney.php new file mode 100644 index 000000000..e2d387560 --- /dev/null +++ b/www/app/pages/doc/incomemoney.php @@ -0,0 +1,120 @@ +add(new Form('docform')); + $this->docform->add(new TextInput('document_number')); + $this->docform->add(new Date('document_date', time())); + + $this->docform->add(new DropDownChoice('mfto', MoneyFund::getList(), H::getDefMF())); + $this->docform->add(new TextInput('notes')); + $this->docform->add(new TextInput('amount')); + + $this->docform->add(new SubmitButton('savedoc'))->onClick($this, 'savedocOnClick'); + $this->docform->add(new SubmitButton('execdoc'))->onClick($this, 'savedocOnClick'); + $this->docform->add(new Button('backtolist'))->onClick($this, 'backtolistOnClick'); + + + if ($docid > 0) { //загружаем содержимок документа на страницу + $this->_doc = Document::load($docid)->cast(); + $this->docform->document_number->setText($this->_doc->document_number); + $this->docform->document_date->setDate($this->_doc->document_date); + + $this->docform->mfto->setValue($this->_doc->headerdata['mfto']); + $this->docform->notes->setText($this->_doc->notes); + $this->docform->amount->setText($this->_doc->amount); + } else { + $this->_doc = Document::create('IncomeMoney'); + $this->docform->document_number->setText($this->_doc->nextNumber()); + } + + + if (false == \App\ACL::checkShowDoc($this->_doc)) + return; + } + + public function savedocOnClick($sender) { + + $this->_doc->notes = $this->docform->notes->getText(); + + $this->_doc->headerdata['mfto'] = $this->docform->mfto->getValue(); + $this->_doc->headerdata['mftoname'] = $this->docform->mfto->getValueName(); + + $this->_doc->amount = $this->docform->amount->getText(); + $this->_doc->document_number = trim($this->docform->document_number->getText()); + $this->_doc->document_date = strtotime($this->docform->document_date->getText()); + + if ($this->checkForm() == false) { + return; + } + + $isEdited = $this->_doc->document_id > 0; + + $conn = \ZDB\DB::getConnect(); + $conn->BeginTrans(); + try { + + $this->_doc->save(); + if ($sender->id == 'execdoc') { + if (!$isEdited) + $this->_doc->updateStatus(Document::STATE_NEW); + $this->_doc->updateStatus(Document::STATE_EXECUTED); + } else { + $this->_doc->updateStatus($isEdited ? Document::STATE_EDITED : Document::STATE_NEW); + } + $conn->CommitTrans(); + App::RedirectBack(); + } catch (\Exception $ee) { + global $logger; + $conn->RollbackTrans(); + $this->setError($ee->getMessage()); + + $logger->error($ee->getMessage() . " Документ " . $this->_doc->meta_desc); + + return; + } + } + + /** + * Валидация формы + * + */ + private function checkForm() { + + if (strlen($this->_doc->document_number) == 0) { + $this->setError("Не введен номер документа"); + } + + if (($this->_doc->amount > 0) == false) { + $this->setError("Не введена сумма"); + } + + return !$this->isError(); + } + +} diff --git a/www/app/pages/doc/moveitem.php b/www/app/pages/doc/moveitem.php index 7d141908b..f4cc3800b 100644 --- a/www/app/pages/doc/moveitem.php +++ b/www/app/pages/doc/moveitem.php @@ -58,7 +58,7 @@ public function __construct($docid = 0) { $this->editdetail->add(new Button('cancelrow'))->onClick($this, 'cancelrowOnClick'); if ($docid > 0) { //загружаем содержимок документа на страницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->document_date->setDate($this->_doc->document_date); $this->docform->storefrom->setValue($this->_doc->headerdata['storefrom']); @@ -82,11 +82,11 @@ public function __construct($docid = 0) { public function detailOnRow($row) { $item = $row->getDataItem(); - + $row->add(new Label('item', $item->itemname)); $row->add(new Label('msr', $item->msr)); $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('quantity', H::fqty($item->quantity))); @@ -175,12 +175,14 @@ public function savedocOnClick($sender) { return; } $this->_doc->notes = $this->docform->notes->getText(); - - - $this->_doc->headerdata['storefrom'] = $this->docform->storefrom->getValue(); - $this->_doc->headerdata['storeto'] = $this->docform->storeto->getValue(); - - + + + $this->_doc->headerdata['storefrom'] = $this->docform->storefrom->getValue(); + $this->_doc->headerdata['storefromname'] = $this->docform->storefrom->getValueName(); + $this->_doc->headerdata['storeto'] = $this->docform->storeto->getValue(); + $this->_doc->headerdata['storetoname'] = $this->docform->storeto->getValueName(); + + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/movemoney.php b/www/app/pages/doc/movemoney.php new file mode 100644 index 000000000..1e5ac2354 --- /dev/null +++ b/www/app/pages/doc/movemoney.php @@ -0,0 +1,126 @@ +add(new Form('docform')); + $this->docform->add(new TextInput('document_number')); + $this->docform->add(new Date('document_date', time())); + + $this->docform->add(new DropDownChoice('mffrom', MoneyFund::getList(), H::getDefMF())); + $this->docform->add(new DropDownChoice('mfto', MoneyFund::getList(), H::getDefMF())); + $this->docform->add(new TextInput('notes')); + $this->docform->add(new TextInput('amount')); + + $this->docform->add(new SubmitButton('savedoc'))->onClick($this, 'savedocOnClick'); + $this->docform->add(new SubmitButton('execdoc'))->onClick($this, 'savedocOnClick'); + $this->docform->add(new Button('backtolist'))->onClick($this, 'backtolistOnClick'); + + + if ($docid > 0) { //загружаем содержимок документа на страницу + $this->_doc = Document::load($docid)->cast(); + $this->docform->document_number->setText($this->_doc->document_number); + $this->docform->document_date->setDate($this->_doc->document_date); + $this->docform->mffrom->setValue($this->_doc->headerdata['mffrom']); + $this->docform->mfto->setValue($this->_doc->headerdata['mfto']); + $this->docform->notes->setText($this->_doc->notes); + $this->docform->amount->setText($this->_doc->amount); + } else { + $this->_doc = Document::create('MoveMoney'); + $this->docform->document_number->setText($this->_doc->nextNumber()); + } + + + if (false == \App\ACL::checkShowDoc($this->_doc)) + return; + } + + public function savedocOnClick($sender) { + + $this->_doc->notes = $this->docform->notes->getText(); + + $this->_doc->headerdata['mffrom'] = $this->docform->mffrom->getValue(); + $this->_doc->headerdata['mffromname'] = $this->docform->mffrom->getValueName(); + $this->_doc->headerdata['mfto'] = $this->docform->mfto->getValue(); + $this->_doc->headerdata['mftoname'] = $this->docform->mfto->getValueName(); + + $this->_doc->amount = $this->docform->amount->getText(); + $this->_doc->document_number = trim($this->docform->document_number->getText()); + $this->_doc->document_date = strtotime($this->docform->document_date->getText()); + + if ($this->checkForm() == false) { + return; + } + + $isEdited = $this->_doc->document_id > 0; + + $conn = \ZDB\DB::getConnect(); + $conn->BeginTrans(); + try { + + $this->_doc->save(); + if ($sender->id == 'execdoc') { + if (!$isEdited) + $this->_doc->updateStatus(Document::STATE_NEW); + $this->_doc->updateStatus(Document::STATE_EXECUTED); + } else { + $this->_doc->updateStatus($isEdited ? Document::STATE_EDITED : Document::STATE_NEW); + } + $conn->CommitTrans(); + App::RedirectBack(); + } catch (\Exception $ee) { + global $logger; + $conn->RollbackTrans(); + $this->setError($ee->getMessage()); + + $logger->error($ee->getMessage() . " Документ " . $this->_doc->meta_desc); + + return; + } + } + + /** + * Валидация формы + * + */ + private function checkForm() { + + if (strlen($this->_doc->document_number) == 0) { + $this->setError("Не введен номер документа"); + } + + if ($this->docform->mfto->getValue() == $this->docform->mffrom->getValue()) { + $this->setError("Выбран тот же счет получатель"); + } + if (($this->_doc->amount > 0) == false) { + $this->setError("Не введена сумма"); + } + + return !$this->isError(); + } + +} diff --git a/www/app/pages/doc/order.php b/www/app/pages/doc/order.php index cdd6e3857..85972ba92 100644 --- a/www/app/pages/doc/order.php +++ b/www/app/pages/doc/order.php @@ -91,7 +91,7 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editcust->add(new SubmitButton('savecust'))->onClick($this, 'savecustOnClick'); if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->document_date->setDate($this->_doc->document_date); @@ -232,24 +232,24 @@ public function savedocOnClick($sender) { } $this->calcTotal(); - $old = $this->_doc->cast(); - - $this->_doc->headerdata['delivery'] = $this->docform->delivery->getValue(); - $this->_doc->headerdata['delivery_name'] = $this->docform->delivery->getValueName(); - $this->_doc->headerdata['address'] = $this->docform->address->getText(); - $this->_doc->headerdata['email'] = $this->docform->email->getText(); - $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - - - + + + $this->_doc->headerdata['delivery'] = $this->docform->delivery->getValue(); + $this->_doc->headerdata['delivery_name'] = $this->docform->delivery->getValueName(); + $this->_doc->headerdata['address'] = $this->docform->address->getText(); + $this->_doc->headerdata['email'] = $this->docform->email->getText(); + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + + + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); } $this->_doc->amount = $this->docform->total->getText(); - //$this->_doc->datatag = $this->_doc->amount; + $isEdited = $this->_doc->document_id > 0; $conn = \ZDB\DB::getConnect(); diff --git a/www/app/pages/doc/ordercust.php b/www/app/pages/doc/ordercust.php index 2d05e3841..34b22ffc5 100644 --- a/www/app/pages/doc/ordercust.php +++ b/www/app/pages/doc/ordercust.php @@ -74,7 +74,7 @@ public function __construct($docid = 0, $basedocid = 0) { if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->notes->setText($this->_doc->notes); @@ -223,7 +223,7 @@ public function savedocOnClick($sender) { if ($this->checkForm() == false) { return; } - $old = $this->_doc->cast(); + $this->calcTotal(); $common = System::getOptions("common"); @@ -233,8 +233,8 @@ public function savedocOnClick($sender) { if ($common['useval'] != true) continue; } - - + + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/outcomemoney.php b/www/app/pages/doc/outcomemoney.php new file mode 100644 index 000000000..d8ca6572e --- /dev/null +++ b/www/app/pages/doc/outcomemoney.php @@ -0,0 +1,120 @@ +add(new Form('docform')); + $this->docform->add(new TextInput('document_number')); + $this->docform->add(new Date('document_date', time())); + + $this->docform->add(new DropDownChoice('mffrom', MoneyFund::getList(), H::getDefMF())); + $this->docform->add(new TextInput('notes')); + $this->docform->add(new TextInput('amount')); + + $this->docform->add(new SubmitButton('savedoc'))->onClick($this, 'savedocOnClick'); + $this->docform->add(new SubmitButton('execdoc'))->onClick($this, 'savedocOnClick'); + $this->docform->add(new Button('backtolist'))->onClick($this, 'backtolistOnClick'); + + + if ($docid > 0) { //загружаем содержимок документа на страницу + $this->_doc = Document::load($docid)->cast(); + $this->docform->document_number->setText($this->_doc->document_number); + $this->docform->document_date->setDate($this->_doc->document_date); + + $this->docform->mfto->setValue($this->_doc->headerdata['mfto']); + $this->docform->notes->setText($this->_doc->notes); + $this->docform->amount->setText($this->_doc->amount); + } else { + $this->_doc = Document::create('OutcomeMoney'); + $this->docform->document_number->setText($this->_doc->nextNumber()); + } + + + if (false == \App\ACL::checkShowDoc($this->_doc)) + return; + } + + public function savedocOnClick($sender) { + + $this->_doc->notes = $this->docform->notes->getText(); + + $this->_doc->headerdata['mffrom'] = $this->docform->mffrom->getValue(); + $this->_doc->headerdata['mffromname'] = $this->docform->mffrom->getValueName(); + + $this->_doc->amount = $this->docform->amount->getText(); + $this->_doc->document_number = trim($this->docform->document_number->getText()); + $this->_doc->document_date = strtotime($this->docform->document_date->getText()); + + if ($this->checkForm() == false) { + return; + } + + $isEdited = $this->_doc->document_id > 0; + + $conn = \ZDB\DB::getConnect(); + $conn->BeginTrans(); + try { + + $this->_doc->save(); + if ($sender->id == 'execdoc') { + if (!$isEdited) + $this->_doc->updateStatus(Document::STATE_NEW); + $this->_doc->updateStatus(Document::STATE_EXECUTED); + } else { + $this->_doc->updateStatus($isEdited ? Document::STATE_EDITED : Document::STATE_NEW); + } + $conn->CommitTrans(); + App::RedirectBack(); + } catch (\Exception $ee) { + global $logger; + $conn->RollbackTrans(); + $this->setError($ee->getMessage()); + + $logger->error($ee->getMessage() . " Документ " . $this->_doc->meta_desc); + + return; + } + } + + /** + * Валидация формы + * + */ + private function checkForm() { + + if (strlen($this->_doc->document_number) == 0) { + $this->setError("Не введен номер документа"); + } + + if (($this->_doc->amount > 0) == false) { + $this->setError("Не введена сумма"); + } + + return !$this->isError(); + } + +} diff --git a/www/app/pages/doc/prodissue.php b/www/app/pages/doc/prodissue.php index e995ddbbf..58be986b6 100644 --- a/www/app/pages/doc/prodissue.php +++ b/www/app/pages/doc/prodissue.php @@ -40,7 +40,7 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->add(new Date('document_date'))->setDate(time()); $this->docform->add(new DropDownChoice('store', Store::getList(), H::getDefStore()))->onChange($this, 'OnChangeStore'); - $this->docform->add(new DropDownChoice('parea', \App\Entity\Prodarea::findArray("pa_name", ""), 0)); + $this->docform->add(new DropDownChoice('parea', \App\Entity\Prodarea::findArray("pa_name", ""), 0)); $this->docform->add(new TextInput('notes')); $this->docform->add(new CheckBox('planned')); @@ -67,14 +67,14 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new SubmitButton('submitrow'))->onClick($this, 'saverowOnClick'); if ($docid > 0) { //загружаем содержимое документа на страницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->planned->setChecked($this->_doc->headerdata['planned']); $this->docform->document_date->setDate($this->_doc->document_date); $this->docform->store->setValue($this->_doc->headerdata['store']); - $this->docform->parea->setValue($this->_doc->headerdata['parea']); + $this->docform->parea->setValue($this->_doc->headerdata['parea']); $this->docform->notes->setText($this->_doc->notes); @@ -102,7 +102,7 @@ public function detailOnRow($row) { $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('amount', round($item->quantity * $item->price))); $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); @@ -154,11 +154,11 @@ public function saverowOnClick($sender) { $this->setError("Не выбран товар"); return; } - + $stock = Stock::load($id); $stock->quantity = $this->editdetail->editquantity->getText(); - $qstock=$this->editdetail->qtystock->getText(); - if($stock->quantity > $qstock) { + $qstock = $this->editdetail->qtystock->getText(); + if ($stock->quantity > $qstock) { $this->setWarn('Недостаточное количество на складе'); } @@ -201,22 +201,22 @@ public function savedocOnClick($sender) { } $this->calcTotal(); - $old = $this->_doc->cast(); - - - $this->_doc->headerdata['parea'] = $this->docform->parea->getValue(); - $this->_doc->headerdata['pareaname'] = $this->docform->parea->getValueName(); - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; - - + + + + $this->_doc->headerdata['parea'] = $this->docform->parea->getValue(); + $this->_doc->headerdata['pareaname'] = $this->docform->parea->getValueName(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); } $this->_doc->amount = $this->docform->total->getText(); - $this->_doc->datatag = $this->_doc->amount; + $this->_doc->payamount = $this->_doc->amount; $isEdited = $this->_doc->document_id > 0; $conn = \ZDB\DB::getConnect(); diff --git a/www/app/pages/doc/prodreceipt.php b/www/app/pages/doc/prodreceipt.php index e529d2e70..dddd6a44a 100644 --- a/www/app/pages/doc/prodreceipt.php +++ b/www/app/pages/doc/prodreceipt.php @@ -69,13 +69,13 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new SubmitButton('saverow'))->onClick($this, 'saverowOnClick'); if ($docid > 0) { //загружаем содержимое документа на страницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->planned->setChecked($this->_doc->headerdata['planned']); $this->docform->notes->setText($this->_doc->notes); $this->docform->document_date->setDate($this->_doc->document_date); - $this->docform->parea->setValue($this->_doc->headerdata['parea']); + $this->docform->parea->setValue($this->_doc->headerdata['parea']); $this->docform->store->setValue($this->_doc->headerdata['store']); @@ -103,8 +103,8 @@ public function detailOnRow($row) { $row->add(new Label('msr', $item->msr)); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); - $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('snumber', $item->snumber)); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('amount', round($item->quantity * $item->price))); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); @@ -177,11 +177,11 @@ public function saverowOnClick($sender) { } $item->snumber = $this->editdetail->editsnumber->getText(); $item->sdate = $this->editdetail->editsdate->getDate(); - if($item->sdate == false)$item->sdate=''; - if(strlen($item->snumber)>0 && strlen($item->sdate )==0) { - $this->setError("К серии должна быть введена дата"); + if ($item->sdate == false) + $item->sdate = ''; + if (strlen($item->snumber) > 0 && strlen($item->sdate) == 0) { + $this->setError("К серии должна быть введена дата"); return; - } @@ -199,7 +199,7 @@ public function saverowOnClick($sender) { $this->editdetail->editprice->setText(""); $this->editdetail->editsnumber->setText(""); - $this->editdetail->editsdate->setText(""); + $this->editdetail->editsdate->setText(""); } public function cancelrowOnClick($sender) { @@ -214,15 +214,15 @@ public function savedocOnClick($sender) { if ($this->checkForm() == false) { return; } - $old = $this->_doc->cast(); + $this->calcTotal(); - - - $this->_doc->headerdata['parea'] = $this->docform->parea->getValue(); - $this->_doc->headerdata['pareaname'] = $this->docform->parea->getValueName(); - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; - + + + $this->_doc->headerdata['parea'] = $this->docform->parea->getValue(); + $this->_doc->headerdata['pareaname'] = $this->docform->parea->getValueName(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + $this->_doc->detaildata = array(); foreach ($this->_itemlist as $item) { $this->_doc->detaildata[] = $item->getData(); @@ -230,7 +230,7 @@ public function savedocOnClick($sender) { $this->_doc->amount = $this->docform->total->getText(); $isEdited = $this->_doc->document_id > 0; - $this->_doc->datatag = $this->_doc->amount; + $this->_doc->payamount = $this->_doc->amount; $conn = \ZDB\DB::getConnect(); diff --git a/www/app/pages/doc/retcustissue.php b/www/app/pages/doc/retcustissue.php index 9cf16489f..059949e21 100644 --- a/www/app/pages/doc/retcustissue.php +++ b/www/app/pages/doc/retcustissue.php @@ -76,7 +76,7 @@ public function __construct($docid = 0, $basedocid = 0) { if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); @@ -133,7 +133,7 @@ public function detailOnRow($row) { $row->add(new Label('code', $item->item_code)); $row->add(new Label('msr', $item->msr)); $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('quantity', H::fqty($item->quantity))); $row->add(new Label('price', $item->price)); @@ -239,11 +239,11 @@ public function savedocOnClick($sender) { } $this->calcTotal(); - $old = $this->_doc->cast(); - - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - + + + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/doc/returnissue.php b/www/app/pages/doc/returnissue.php index 271921d73..2c92a3b47 100644 --- a/www/app/pages/doc/returnissue.php +++ b/www/app/pages/doc/returnissue.php @@ -19,6 +19,7 @@ use \App\Entity\Item; use \App\Entity\Stock; use \App\Entity\Store; +use \App\Entity\MoneyFund; use \App\Helper as H; use \App\Application as App; @@ -46,6 +47,8 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->add(new AutocompleteTextInput('customer'))->onText($this, 'OnAutoCustomer'); $this->docform->add(new TextInput('notes')); + $this->docform->add(new DropDownChoice('payment', MoneyFund::getList(), H::getDefMF()))->onChange($this, "onMF"); + $this->docform->add(new TextInput('paynotes')); $this->docform->add(new SubmitLink('addrow'))->onClick($this, 'addrowOnClick'); @@ -68,7 +71,7 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new SubmitButton('submitrow'))->onClick($this, 'saverowOnClick'); if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); @@ -79,6 +82,8 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->customer->setText($this->_doc->customer_name); $this->docform->notes->setText($this->_doc->notes); + $this->docform->payment->setValue($this->_doc->headerdata['payment']); + $this->docform->paynotes->setText($this->_doc->headerdata['paynotes']); foreach ($this->_doc->detaildata as $item) { $it = new Stock($item); @@ -111,6 +116,12 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->add(new DataView('detail', new \Zippy\Html\DataList\ArrayDataSource(new \Zippy\Binding\PropertyBinding($this, '_tovarlist')), $this, 'detailOnRow'))->Reload(); if (false == \App\ACL::checkShowDoc($this->_doc)) return; + $this->onMF($this->docform->payment); + } + + public function onMF($sender) { + $mf = $sender->getValue(); + $this->docform->paynotes->setVisible($mf > 0); } public function detailOnRow($row) { @@ -119,7 +130,7 @@ public function detailOnRow($row) { $row->add(new Label('tovar', $item->itemname)); $row->add(new Label('msr', $item->msr)); $row->add(new Label('snumber', $item->snumber)); - $row->add(new Label('sdate', $item->sdate >0 ?date('Y-m-d',$item->sdate):'')); + $row->add(new Label('sdate', $item->sdate > 0 ? date('Y-m-d', $item->sdate) : '')); $row->add(new Label('quantity', H::fqty($item->quantity))); @@ -218,11 +229,13 @@ public function savedocOnClick($sender) { } $this->calcTotal(); - $old = $this->_doc->cast(); - - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - + + + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['payment'] = $this->docform->payment->getValue(); + $this->_doc->headerdata['paynotes'] = $this->docform->paynotes->getText(); + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/doc/serviceact.php b/www/app/pages/doc/serviceact.php index 5410d492f..ddf7cfd99 100644 --- a/www/app/pages/doc/serviceact.php +++ b/www/app/pages/doc/serviceact.php @@ -16,9 +16,12 @@ use \Zippy\Html\Form\SubmitButton; use \Zippy\Html\Form\TextArea; use \Zippy\Html\Form\TextInput; +use \Zippy\Html\Form\DropDownChoice; use \Zippy\Html\Label; use \Zippy\Html\Link\ClickLink; use \Zippy\Html\Link\SubmitLink; +use \App\Entity\MoneyFund; +use \App\Helper as H; /** * Страница ввода акта выполненных работ @@ -44,7 +47,9 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->add(new TextInput('notes')); $this->docform->add(new TextInput('gar')); $this->docform->add(new CheckBox('planned')); - $this->docform->add(new CheckBox('payed')); + $this->docform->add(new DropDownChoice('payment', MoneyFund::getList(), H::getDefMF()))->onChange($this, "onMF"); + $this->docform->add(new TextInput('paynotes')); + $this->docform->add(new Label('discount'))->setVisible(false); $this->docform->add(new TextInput('order')); @@ -75,13 +80,15 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editcust->add(new SubmitButton('savecust'))->onClick($this, 'savecustOnClick'); if ($docid > 0) { //загружаем содержимок документа на страницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->notes->setText($this->_doc->headerdata['notes']); $this->docform->gar->setText($this->_doc->headerdata['gar']); $this->docform->planned->setChecked($this->_doc->headerdata['planned']); $this->docform->order->setText($this->_doc->headerdata['order']); $this->_order_id = $this->_doc->headerdata['order_id']; + $this->docform->payment->setValue($this->_doc->headerdata['payment']); + $this->docform->paynotes->setText($this->_doc->headerdata['paynotes']); $this->docform->document_date->setDate($this->_doc->document_date); $this->docform->customer->setKey($this->_doc->customer_id); @@ -129,7 +136,6 @@ public function __construct($docid = 0, $basedocid = 0) { } } } - $this->docform->payed->setChecked($this->_doc->datatag == $this->_doc->amount); $this->docform->add(new DataView('detail', new \Zippy\Html\DataList\ArrayDataSource(new \Zippy\Binding\PropertyBinding($this, '_servicelist')), $this, 'detailOnRow'))->Reload(); $this->calcTotal(); @@ -140,6 +146,12 @@ public function __construct($docid = 0, $basedocid = 0) { if ($this->_order_id) { $this->docform->inprocdoc->setVisible(false); //Прячем если есть заказ чтобы не дублировать } + $this->onMF($this->docform->payment); + } + + public function onMF($sender) { + $mf = $sender->getValue(); + $this->docform->paynotes->setVisible($mf > 0); } public function detailOnRow($row) { @@ -237,15 +249,14 @@ public function savedocOnClick($sender) { $this->calcTotal(); - $old = $this->_doc->cast(); - - - $this->_doc->headerdata['order'] = $this->docform->order->getText(); - $this->_doc->headerdata['order_id'] = $this->_order_id; - $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0,; - $this->_doc->headerdata['gar'] = $this->docform->gar->getText(); - + $this->_doc->headerdata['order'] = $this->docform->order->getText(); + $this->_doc->headerdata['order_id'] = $this->_order_id; + $this->_doc->headerdata['planned'] = $this->docform->planned->isChecked() ? 1 : 0; + $this->_doc->headerdata['gar'] = $this->docform->gar->getText(); + $this->_doc->headerdata['payment'] = $this->docform->payment->getValue(); + $this->_doc->headerdata['paynotes'] = $this->docform->paynotes->getText(); + $this->_doc->detaildata = array(); foreach ($this->_servicelist as $item) { $this->_doc->detaildata[] = $item->getData(); @@ -253,11 +264,7 @@ public function savedocOnClick($sender) { $isEdited = $this->_doc->document_id > 0; $this->_doc->amount = $this->docform->total->getText(); - if ($this->docform->payed->isChecked() == true && $this->_doc->datatag < $this->_doc->amount) { - $this->_doc->addPayment(System::getUser()->user_id, $this->_doc->amount - $this->_doc->datatag); - $this->_doc->datatag = $this->_doc->amount; - } $conn = \ZDB\DB::getConnect(); $conn->BeginTrans(); diff --git a/www/app/pages/doc/serviceorder.php b/www/app/pages/doc/serviceorder.php index 79533629f..1f4151fcc 100644 --- a/www/app/pages/doc/serviceorder.php +++ b/www/app/pages/doc/serviceorder.php @@ -80,7 +80,7 @@ public function __construct($docid = 0, $basedocid = 0) { if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->notes->setText($this->_doc->headerdata['notes']); @@ -197,9 +197,9 @@ public function savedocOnClick($sender) { $this->calcTotal(); - $old = $this->_doc->cast(); - - + + + $this->_doc->detaildata = array(); foreach ($this->_servicelist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/task.php b/www/app/pages/doc/task.php index 6cabccd51..cc9f83f1e 100644 --- a/www/app/pages/doc/task.php +++ b/www/app/pages/doc/task.php @@ -25,6 +25,7 @@ use \App\Entity\Equipment; use \App\Application as App; use \App\Helper as H; +use \App\Entity\MoneyFund; /** * Страница ввода наряда на работу @@ -57,6 +58,8 @@ public function __construct($docid = 0) { $this->docform->add(new DropDownChoice('store', Store::getList(), \App\Helper::getDefStore())); $this->docform->add(new DropDownChoice('parea', Prodarea::findArray("pa_name", ""), 0)); $this->docform->add(new DropDownChoice('pricetype', Item::getPriceTypeList())); + $this->docform->add(new DropDownChoice('payment', MoneyFund::getList(), H::getDefMF()))->onChange($this, "onMF"); + $this->docform->add(new TextInput('paynotes')); $this->docform->add(new SubmitLink('addservice'))->onClick($this, 'addserviceOnClick'); $this->docform->add(new SubmitLink('additem'))->onClick($this, 'additemOnClick'); @@ -126,7 +129,7 @@ public function __construct($docid = 0) { if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->notes->setText($this->_doc->notes); $this->docform->hours->setText($this->_doc->headerdata['hours']); @@ -134,6 +137,8 @@ public function __construct($docid = 0) { $this->docform->start_date->setDate($this->_doc->headerdata['start_date']); $this->docform->pricetype->setValue($this->_doc->headerdata['pricetype']); $this->docform->store->setValue($this->_doc->headerdata['store']); + $this->docform->payment->setValue($this->_doc->headerdata['payment']); + $this->docform->paynotes->setText($this->_doc->headerdata['paynotes']); $this->docform->document_date->setDate($this->_doc->headerdata['end_date']); $this->docform->parea->setValue($this->_doc->headerdata['parea']); @@ -179,6 +184,13 @@ public function __construct($docid = 0) { if (false == \App\ACL::checkShowDoc($this->_doc)) return; + + $this->onMF($this->docform->payment); + } + + public function onMF($sender) { + $mf = $sender->getValue(); + $this->docform->paynotes->setVisible($mf > 0); } public function cancelrowOnClick($sender) { @@ -483,19 +495,19 @@ public function savedocOnClick($sender) { $this->calcTotal(); - $old = $this->_doc->cast(); - - - $this->_doc->headerdata['parea'] = $this->docform->parea->getText(); - $this->_doc->headerdata['pareaname'] = $this->docform->pareaname->getValueName(); - $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); - $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); - $this->_doc->headerdata['store'] = $this->docform->store->getValue(); - $this->_doc->headerdata['hours'] = $this->docform->hours->getText(); - $this->_doc->headerdata['start_date'] = $this->docform->start_date->getDate(); - $this->_doc->headerdata['end_date'] = $this->docform->end_date->getDate(); - - + + $this->_doc->headerdata['parea'] = $this->docform->parea->getText(); + $this->_doc->headerdata['pareaname'] = $this->docform->pareaname->getValueName(); + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); + $this->_doc->headerdata['store'] = $this->docform->store->getValue(); + $this->_doc->headerdata['hours'] = $this->docform->hours->getText(); + $this->_doc->headerdata['start_date'] = $this->docform->start_date->getDate(); + $this->_doc->headerdata['end_date'] = $this->docform->end_date->getDate(); + $this->_doc->headerdata['payment'] = $this->docform->payment->getValue(); + $this->_doc->headerdata['paynotes'] = $this->docform->paynotes->getText(); + + $this->_doc->detaildata = array(); foreach ($this->_servicelist as $item) { $this->_doc->detaildata[] = $item->getData(); diff --git a/www/app/pages/doc/transitem.php b/www/app/pages/doc/transitem.php index d3432e7d8..7ea8b5c00 100644 --- a/www/app/pages/doc/transitem.php +++ b/www/app/pages/doc/transitem.php @@ -52,7 +52,7 @@ public function __construct($docid = 0) { if ($docid > 0) { //загружаем содержимок документа на страницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->document_date->setDate($this->_doc->document_date); $this->docform->storefrom->setValue($this->_doc->headerdata['storefrom']); @@ -69,7 +69,7 @@ public function __construct($docid = 0) { $this->_doc = Document::create('TransItem'); $this->docform->document_number->setText($this->_doc->nextNumber()); } - + if (false == \App\ACL::checkShowDoc($this->_doc)) return; @@ -83,13 +83,13 @@ public function savedocOnClick($sender) { $this->_doc->notes = $this->docform->notes->getText(); - - $this->_doc->headerdata['storefrom'] = $this->docform->storefrom->getValue(); - $this->_doc->headerdata['fromitem'] = $this->docform->fromitem->getKey(); - $this->_doc->headerdata['toitem'] = $this->docform->toitem->getKey(); - $this->_doc->headerdata['fromquantity'] = $this->docform->fromquantity->getText(); - $this->_doc->headerdata['toquantity'] = $this->docform->toquantity->getText(); - + + $this->_doc->headerdata['storefrom'] = $this->docform->storefrom->getValue(); + $this->_doc->headerdata['fromitem'] = $this->docform->fromitem->getKey(); + $this->_doc->headerdata['toitem'] = $this->docform->toitem->getKey(); + $this->_doc->headerdata['fromquantity'] = $this->docform->fromquantity->getText(); + $this->_doc->headerdata['toquantity'] = $this->docform->toquantity->getText(); + if ($this->checkForm() == false) { return; diff --git a/www/app/pages/doc/warranty.php b/www/app/pages/doc/warranty.php index eb14b3b4b..405c0ab9c 100644 --- a/www/app/pages/doc/warranty.php +++ b/www/app/pages/doc/warranty.php @@ -64,7 +64,7 @@ public function __construct($docid = 0, $basedocid = 0) { $this->editdetail->add(new SubmitButton('submitrow'))->onClick($this, 'saverowOnClick'); if ($docid > 0) { //загружаем содержимок документа настраницу - $this->_doc = Document::load($docid); + $this->_doc = Document::load($docid)->cast(); $this->docform->document_number->setText($this->_doc->document_number); $this->docform->customer->setKey($this->_doc->customer_id); @@ -101,7 +101,7 @@ public function __construct($docid = 0, $basedocid = 0) { } } } - + $this->docform->add(new DataView('detail', new \Zippy\Html\DataList\ArrayDataSource(new \Zippy\Binding\PropertyBinding($this, '_tovarlist')), $this, 'detailOnRow'))->Reload(); if (false == \App\ACL::checkShowDoc($this->_doc)) return; @@ -211,11 +211,11 @@ public function savedocOnClick($sender) { $this->_doc->notes = $this->docform->notes->getText(); $this->_doc->customer_id = $this->docform->customer->getKey(); - - - $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); - $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); - + + + $this->_doc->headerdata['pricetype'] = $this->docform->pricetype->getValue(); + $this->_doc->headerdata['pricetypename'] = $this->docform->pricetype->getValueName(); + $this->_doc->detaildata = array(); foreach ($this->_tovarlist as $tovar) { $this->_doc->detaildata[] = $tovar->getData(); diff --git a/www/app/pages/import.php b/www/app/pages/import.php index 87bd07f07..5573726b4 100644 --- a/www/app/pages/import.php +++ b/www/app/pages/import.php @@ -188,7 +188,7 @@ public function onImport($sender) { } $doc->amount = $amount; $doc->headerdata['store'] = $store; - + $doc->save(); $doc->updateStatus(\App\Entity\Doc\Document::STATE_NEW); $doc->updateStatus(\App\Entity\Doc\Document::STATE_EXECUTED); diff --git a/www/app/pages/main.php b/www/app/pages/main.php index 8e3c4ca1a..83181020b 100644 --- a/www/app/pages/main.php +++ b/www/app/pages/main.php @@ -16,13 +16,13 @@ public function __construct() { $this->add(new \App\Widgets\WPlannedDocs("wplanned")); $this->add(new \App\Widgets\WDebitors("wdebitors")); - + $this->add(new \App\Widgets\WNoliq("wnoliq")); - + $this->add(new \App\Widgets\WMinQty("wminqty")); - + $this->add(new \App\Widgets\Wsdate("wsdate"))->setVisible($this->_tvars["usesnumber"]); - + $this->add(new \App\Widgets\WRDoc("wrdoc")); } diff --git a/www/app/pages/options.php b/www/app/pages/options.php index 55c88db14..460389111 100644 --- a/www/app/pages/options.php +++ b/www/app/pages/options.php @@ -32,6 +32,7 @@ public function __construct() { $this->add(new Form('common'))->onSubmit($this, 'saveCommonOnClick'); $this->common->add(new TextInput('firmname')); $this->common->add(new DropDownChoice('defstore', \App\Entity\Store::getList())); + $this->common->add(new DropDownChoice('defmf', \App\Entity\MoneyFund::getList())); $this->common->add(new DropDownChoice('qtydigits')); @@ -49,7 +50,7 @@ public function __construct() { $this->common->add(new TextInput('price5')); // $this->common->add(new Date('closeddate')); - + $common = System::getOptions("common"); @@ -58,6 +59,7 @@ public function __construct() { $this->common->firmname->setText($common['firmname']); $this->common->defstore->setValue($common['defstore']); + $this->common->defmf->setValue($common['defmf']); $this->common->qtydigits->setValue($common['qtydigits']); $this->common->cdoll->setText($common['cdoll']); $this->common->ceuro->setText($common['ceuro']); @@ -77,7 +79,7 @@ public function __construct() { $this->onVal($this->common->useval); - + $this->metadatads = new \ZCL\DB\EntityDataSource("\\App\\Entity\\MetaData", "", "description"); @@ -87,7 +89,7 @@ public function __construct() { $this->listpan->filter->add(new CheckBox('fdic'))->setChecked(true); $this->listpan->filter->add(new CheckBox('frep'))->setChecked(true); $this->listpan->filter->add(new CheckBox('freg'))->setChecked(true); - + $this->listpan->add(new ClickLink('addnew'))->onClick($this, 'addnewOnClick'); $this->listpan->add(new DataView('metarow', $this->metadatads, $this, 'metarowOnRow'))->Reload(); @@ -121,6 +123,7 @@ public function saveCommonOnClick($sender) { $common = array(); $common['firmname'] = $this->common->firmname->getText(); $common['defstore'] = $this->common->defstore->getValue(); + $common['defmf'] = $this->common->defmf->getValue(); $common['qtydigits'] = $this->common->qtydigits->getValue(); $common['cdoll'] = $this->common->cdoll->getText(); $common['ceuro'] = $this->common->ceuro->getText(); @@ -142,7 +145,6 @@ public function saveCommonOnClick($sender) { $this->setSuccess('Сохранено'); } - public function filterOnSubmit($sender) { $where = "1<>1 "; @@ -158,7 +160,7 @@ public function filterOnSubmit($sender) { if ($this->listpan->filter->freg->isChecked()) { $where .= " or meta_type = 3"; } - + $this->metadatads->setWhere($where); diff --git a/www/app/pages/reference/categorylist.php b/www/app/pages/reference/categorylist.php index 6dccb4c03..fa420defb 100644 --- a/www/app/pages/reference/categorylist.php +++ b/www/app/pages/reference/categorylist.php @@ -13,8 +13,8 @@ use \App\Entity\Category; /** -* справочник категорийтоваров -*/ + * справочник категорийтоваров + */ class CategoryList extends \App\Pages\Base { private $_category; @@ -47,13 +47,13 @@ public function deleteOnClick($sender) { $cat_id = $sender->owner->getDataItem()->cat_id; - - $del=Category::delete($cat_id); - if(strlen($del) > 0){ + + $del = Category::delete($cat_id); + if (strlen($del) > 0) { $this->setError($del); return; - } - + } + $this->categorytable->categorylist->Reload(); } diff --git a/www/app/pages/reference/customerlist.php b/www/app/pages/reference/customerlist.php index f38dce23f..f2ab28daa 100644 --- a/www/app/pages/reference/customerlist.php +++ b/www/app/pages/reference/customerlist.php @@ -139,12 +139,12 @@ public function deleteOnClick($sender) { return; - $del = Customer::delete($sender->owner->getDataItem()->customer_id); - if(strlen($del) > 0){ + $del = Customer::delete($sender->owner->getDataItem()->customer_id); + if (strlen($del) > 0) { $this->setError($del); return; - } - + } + $this->customertable->customerlist->Reload(); } diff --git a/www/app/pages/reference/eqlist.php b/www/app/pages/reference/eqlist.php index 637f82202..e38ba4295 100644 --- a/www/app/pages/reference/eqlist.php +++ b/www/app/pages/reference/eqlist.php @@ -25,7 +25,7 @@ class EqList extends \App\Pages\Base { private $_item; - public $_uselist=array(); + public $_uselist = array(); public function __construct() { parent::__construct(); @@ -36,11 +36,11 @@ public function __construct() { $this->filter->add(new TextInput('searchkey')); $this->filter->add(new DropDownChoice('searchemp', Employee::findArray("emp_name", "", "emp_name"), 0)); - + $this->add(new Panel('itemtable'))->setVisible(true); $this->itemtable->add(new DataView('eqlist', new EQDS($this), $this, 'eqlistOnRow')); $this->itemtable->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); - + $this->itemtable->eqlist->setPageSize(25); $this->itemtable->add(new \Zippy\Html\DataList\Paginator('pag', $this->itemtable->eqlist)); $this->itemtable->eqlist->setSelectedClass('table-success'); @@ -58,16 +58,13 @@ public function __construct() { $this->itemdetail->add(new SubmitButton('save'))->onClick($this, 'OnSubmit'); $this->itemdetail->add(new Button('cancel'))->onClick($this, 'cancelOnClick'); - + $this->add(new Panel('usetable'))->setVisible(false); $this->usetable->add(new Label('usename')); $this->usetable->add(new ClickLink('back'))->onClick($this, 'cancelOnClick'); - $this->usetable->add(new DataView('uselist', new ArrayDataSource($this,'_uselist'), $this, 'uselistOnRow')); - + $this->usetable->add(new DataView('uselist', new ArrayDataSource($this, '_uselist'), $this, 'uselistOnRow')); } - - public function eqlistOnRow($row) { $item = $row->getDataItem(); $row->add(new Label('eq_name', $item->eq_name)); @@ -78,7 +75,7 @@ public function eqlistOnRow($row) { $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); } - + public function deleteOnClick($sender) { if (false == \App\ACL::checkEditRef('EqList')) return; @@ -99,36 +96,36 @@ public function deleteOnClick($sender) { public function useOnClick($sender) { $this->itemtable->setVisible(false); - $this->usetable->setVisible(true); - $item=$sender->getOwner()->getDataItem(); - $this->usetable->usename->setText($item->eq_name); + $this->usetable->setVisible(true); + $item = $sender->getOwner()->getDataItem(); + $this->usetable->usename->setText($item->eq_name); $this->_uselist = array(); - - $list = \App\Entity\Doc\Document::find("meta_name='task' and state not in(2,3,1,9) ","document_date desc") ; - - - foreach($list as $task){ + + $list = \App\Entity\Doc\Document::find("meta_name='task' and state not in(2,3,1,9) ", "document_date desc"); + + + foreach ($list as $task) { foreach ($task->detaildata as $value) { if ($value['eq_id'] > 0) { - + $it = new \App\DataItem(array( "usetask" => $task->document_number, "useplace" => $value['eq_name'] )); $this->_uselist[] = $it; - } - } + } } - + $this->usetable->uselist->Reload(); } + public function uselistOnRow($row) { $item = $row->getDataItem(); $row->add(new Label('usetask', $item->usetask)); $row->add(new Label('useplace', $item->useplace)); - - } + } + public function editOnClick($sender) { $this->_item = $sender->owner->getDataItem(); $this->itemtable->setVisible(false); diff --git a/www/app/pages/reference/itemlist.php b/www/app/pages/reference/itemlist.php index 51f238d68..0eebd2307 100644 --- a/www/app/pages/reference/itemlist.php +++ b/www/app/pages/reference/itemlist.php @@ -145,9 +145,9 @@ public function deleteOnClick($sender) { return; $item = $sender->owner->getDataItem(); - - $del= Item::delete($item->item_id) ; - if(strlen($del) > 0){ + + $del = Item::delete($item->item_id); + if (strlen($del) > 0) { $this->setError($del); return; } @@ -173,8 +173,8 @@ public function editOnClick($sender) { $this->itemdetail->editcode->setText($this->_item->item_code); $this->itemdetail->editbarcode->setText($this->_item->bar_code); $this->itemdetail->editmsr->setText($this->_item->msr); - $this->itemdetail->editterm->setText( $this->_item->term); - $this->itemdetail->editminqty->setText( \App\Helper::fqty($this->_item->minqty)); + $this->itemdetail->editterm->setText($this->_item->term); + $this->itemdetail->editminqty->setText(\App\Helper::fqty($this->_item->minqty)); $this->itemdetail->editdisabled->setChecked($this->_item->disabled); $this->itemdetail->editpricelist->setChecked($this->_item->pricelist); } @@ -219,24 +219,24 @@ public function OnSubmit($sender) { $this->_item->minqty = $this->itemdetail->editminqty->getText(); $this->_item->description = $this->itemdetail->editdescription->getText(); $this->_item->disabled = $this->itemdetail->editdisabled->isChecked() ? 1 : 0; - + $this->_item->pricelist = $this->itemdetail->editpricelist->isChecked() ? 1 : 0; - + //проверка уникальности артикула - if(strlen($this->_item->item_code) >0){ - $code = Item::qstr($this->_item->item_code); - $cnt=Item::findCnt("item_id <> {$this->_item->item_id} and item_code={$code} "); - if($cnt > 0){ - $this->setError('Такой артикул уже существует'); - return; - } + if (strlen($this->_item->item_code) > 0) { + $code = Item::qstr($this->_item->item_code); + $cnt = Item::findCnt("item_id <> {$this->_item->item_id} and item_code={$code} "); + if ($cnt > 0) { + $this->setError('Такой артикул уже существует'); + return; + } } $this->_item->Save(); $this->itemtable->itemlist->Reload(); - + $this->itemtable->setVisible(true); - $this->itemdetail->setVisible(false); + $this->itemdetail->setVisible(false); } //комплекты diff --git a/www/app/pages/reference/mflist.php b/www/app/pages/reference/mflist.php index 7aa797b9e..3128f007e 100644 --- a/www/app/pages/reference/mflist.php +++ b/www/app/pages/reference/mflist.php @@ -13,14 +13,13 @@ use \Zippy\Html\Panel; use \App\Entity\MoneyFund; - /** -* Справочник денежных счетов -*/ + * Справочник денежных счетов + */ class MFList extends \App\Pages\Base { private $_mf; - private $_balance ; + private $_balance; public function __construct() { parent::__construct(); @@ -35,9 +34,8 @@ public function __construct() { $this->mfdetail->add(new TextArea('editmf_description')); $this->mfdetail->add(new SubmitButton('save'))->onClick($this, 'saveOnClick'); $this->mfdetail->add(new Button('cancel'))->onClick($this, 'cancelOnClick'); - + $this->_balance = MoneyFund::Balance(); - } public function mflistOnRow($row) { @@ -56,12 +54,12 @@ public function deleteOnClick($sender) { $mf_id = $sender->owner->getDataItem()->mf_id; - + $del = MoneyFund::delete($mf_id); - if(strlen($del) > 0){ - $this->setError($del) ; + if (strlen($del) > 0) { + $this->setError($del); return; - } + } $this->mftable->mflist->Reload(); } diff --git a/www/app/pages/reference/prodarealist.php b/www/app/pages/reference/prodarealist.php index cf58c2f30..fe33b5b6f 100644 --- a/www/app/pages/reference/prodarealist.php +++ b/www/app/pages/reference/prodarealist.php @@ -43,12 +43,12 @@ public function deleteOnClick($sender) { if (false == \App\ACL::checkEditRef('ProdAreaList')) return; - - $del=ProdArea::delete($pa_id); - if(strlen($del) > 0){ + + $del = ProdArea::delete($pa_id); + if (strlen($del) > 0) { $this->setError($del); return; - } + } $this->patable->palist->Reload(); } diff --git a/www/app/pages/reference/servicelist.php b/www/app/pages/reference/servicelist.php index b08087d2e..fefdde293 100644 --- a/www/app/pages/reference/servicelist.php +++ b/www/app/pages/reference/servicelist.php @@ -50,12 +50,12 @@ public function deleteOnClick($sender) { return; $service_id = $sender->owner->getDataItem()->service_id; - - $del=Service::delete($service_id); - if(strlen($del) > 0){ + + $del = Service::delete($service_id); + if (strlen($del) > 0) { $this->setError($del); return; - } + } $this->servicetable->servicelist->Reload(); } diff --git a/www/app/pages/reference/storelist.php b/www/app/pages/reference/storelist.php index 0678e6b32..7774f7564 100644 --- a/www/app/pages/reference/storelist.php +++ b/www/app/pages/reference/storelist.php @@ -56,10 +56,10 @@ public function storeeditOnClick($sender) { public function storedeleteOnClick($sender) { if (false == \App\ACL::checkEditRef('StoreList')) return; - - + + $del = Store::delete($sender->owner->getDataItem()->store_id); - if(strlen($del) > 0){ + if (strlen($del) > 0) { $this->setError($del); return; } diff --git a/www/app/pages/register/doclist.php b/www/app/pages/register/doclist.php index 0e1c1a1d2..ff7f565eb 100644 --- a/www/app/pages/register/doclist.php +++ b/www/app/pages/register/doclist.php @@ -71,11 +71,11 @@ public function __construct($docid = 0) { $this->add(new \App\Widgets\DocView('docview'))->setVisible(false); if ($docid > 0) { $this->docview->setVisible(true); - $dc=Document::load($docid); + $dc = Document::load($docid); $this->docview->setDoc($dc); //$this->doclist->setSelectedRow($docid); - $filter->searchnumber = $dc->document_number; - $this->filter->searchnumber->setText($dc->document_number) ; + $filter->searchnumber = $dc->document_number; + $this->filter->searchnumber->setText($dc->document_number); $doclist->Reload(); } @@ -197,9 +197,9 @@ public function deleteOnClick($sender) { $doc = $sender->owner->getDataItem(); if (false == \App\ACL::checkEditDoc($doc, true)) return; - - $del=Document::delete($doc->document_id); - if(strlen($del) > 0){ + + $del = Document::delete($doc->document_id); + if (strlen($del) > 0) { $this->setError($del); return; } @@ -225,7 +225,7 @@ public function cancelOnClick($sender) { public function OnAutoCustomer($sender) { $text = Customer::qstr('%' . $sender->getText() . '%'); - return Customer::findArray("customer_name", "Customer_name like " . $text); + return Customer::findArray("customer_name", "customer_name like " . $text); } public function oncsv($sender) { diff --git a/www/app/pages/register/gilist.php b/www/app/pages/register/gilist.php index cc42f811d..637d422c7 100644 --- a/www/app/pages/register/gilist.php +++ b/www/app/pages/register/gilist.php @@ -102,7 +102,7 @@ public function doclistOnRow($row) { $row->add(new Label('amount', $doc->amount)); $row->add(new Label('order', $doc->headerdata['order'])); $row->add(new Label('customer', $doc->customer_name)); - $row->add(new Label('spay', $doc->amount - $doc->datatag)); + $row->add(new Label('spay', $doc->amount - $doc->payamount)); $row->add(new Label('state', Document::getStateName($doc->state))); @@ -150,7 +150,7 @@ public function statusOnSubmit($sender) { if ($order instanceof Document) { $order = $order->cast(); - if ($order->state != Document::STATE_CLOSED && $this->_doc->amount == $this->_doc->datatag) { //если все доставлено и оплачено закрываем заказ + if ($order->state != Document::STATE_CLOSED && $this->_doc->amount == $this->_doc->payamount) { //если все доставлено и оплачено закрываем заказ $order->updateStatus(Document::STATE_CLOSED); $msg .= " Заказ {$order->document_number} закрыт"; } @@ -173,7 +173,7 @@ public function statusOnSubmit($sender) { $this->_doc->updateStatus(Document::STATE_CLOSED); if ($order instanceof Document) { $order = $order->cast(); - if ($order->state != Document::STATE_CLOSED && $this->_doc->amount == $this->_doc->datatag) { //если все выполнено и оплачено закрываем заказ + if ($order->state != Document::STATE_CLOSED && $this->_doc->amount == $this->_doc->payamount) { //если все выполнено и оплачено закрываем заказ $order->updateStatus(Document::STATE_CLOSED); $msg .= " Заказ {$order->document_number} закрыт"; } @@ -288,7 +288,7 @@ public function payOnClick($sender) { $this->goAnkor('dankor'); - $this->paypan->payform->pamount->setText($this->_doc->amount - $this->_doc->datatag); + $this->paypan->payform->pamount->setText($this->_doc->amount - $this->_doc->payamount); ; $this->paypan->payform->pcomment->setText(""); ; @@ -317,25 +317,17 @@ public function payOnSubmit($sender) { return; $this->_doc->addPayment(System::getUser()->getUserName(), $amount, $form->pcomment->getText()); - $this->_doc->datatag += $amount; - if ($this->_doc->datatag > $this->_doc->amount) { + $this->_doc->payamount += $amount; + if ($this->_doc->payamount > $this->_doc->amount) { $this->setWarn('Сумма больше необходимой оплаты'); } $this->_doc->save(); - if ($this->_doc->datatag < $this->_doc->amount) { - //$this->_doc->updateStatus(Document::STATE_PART_PAYED); - } - if ($this->_doc->datatag == $this->_doc->amount) { - //$this->_doc->updateStatus(Document::STATE_PAYED); - } - $this->setSuccess('Оплата добавлена'); - - + $this->setSuccess('Оплата добавлена'); $this->doclist->Reload(false); - ; + $this->paypan->setVisible(false); } @@ -397,7 +389,7 @@ private function getWhere() { $where .= " and state = " . Document::STATE_INSHIPMENT; } if ($status == 4) { - $where .= " and amount > datatag"; + $where .= " and amount > payamount"; } if ($status == 5) { $where .= " and state = " . Document::STATE_INPROCESS; diff --git a/www/app/pages/register/grlist.php b/www/app/pages/register/grlist.php index 9a7d3c087..6ba8de131 100644 --- a/www/app/pages/register/grlist.php +++ b/www/app/pages/register/grlist.php @@ -69,7 +69,7 @@ public function __construct() { $this->add(new Panel("paypan"))->setVisible(false); $this->paypan->add(new Label("pname")); $this->paypan->add(new Form('payform'))->onSubmit($this, 'payOnSubmit'); - + $this->paypan->payform->add(new DropDownChoice('payment', \App\Entity\MoneyFund::getList(), H::getDefMF())); $this->paypan->payform->add(new TextInput('pamount')); $this->paypan->payform->add(new TextInput('pcomment')); $this->paypan->payform->add(new SubmitButton('bpay'))->onClick($this, 'payOnSubmit'); @@ -96,7 +96,7 @@ public function doclistOnRow($row) { $row->add(new Label('date', date('d-m-Y', $doc->document_date))); $row->add(new Label('onotes', $doc->notes)); $row->add(new Label('amount', $doc->amount)); - $row->add(new Label('spay', $doc->amount - $doc->datatag)); + $row->add(new Label('spay', abs($doc->amount - $doc->payamount))); $row->add(new Label('customer', $doc->customer_name)); $row->add(new Label('state', Document::getStateName($doc->state))); @@ -172,23 +172,24 @@ public function payOnClick($sender) { $this->goAnkor('dankor'); - $this->paypan->payform->pamount->setText($this->_doc->amount - $this->_doc->datatag); + $this->paypan->payform->pamount->setText($this->_doc->amount - $this->_doc->payamount); ; $this->paypan->payform->pcomment->setText(""); ; $this->paypan->pname->setText($this->_doc->document_number); ; - $this->_pays = $this->_doc->getPayments(); + $this->_pays = \App\Entity\Pay::getPayments($this->_doc->document_id); $this->paypan->paylist->Reload(); } public function payOnRow($row) { $pay = $row->getDataItem(); - $row->add(new Label('plamount', $pay->amount)); - $row->add(new Label('pluser', $pay->user)); - $row->add(new Label('pldate', date('Y-m-d', $pay->date))); - $row->add(new Label('plcomment', $pay->comment)); + $row->add(new Label('plamount', 0 - $pay->amount)); + $row->add(new Label('pluser', $pay->username)); + $row->add(new Label('pldate', date('Y-m-d', $pay->paydate))); + $row->add(new Label('plmft', $pay->mf_name)); + $row->add(new Label('plcomment', $pay->notes)); } public function payOnSubmit($sender) { @@ -200,21 +201,18 @@ public function payOnSubmit($sender) { if ($amount == 0) return; - $this->_doc->addPayment(System::getUser()->getUserName(), $amount, $form->pcomment->getText()); - $this->_doc->datatag += $amount; - if ($this->_doc->datatag > $this->_doc->amount) { + + \App\Entity\Pay::addPayment($this->_doc->document_id, 0 - $amount, $form->payment->getValue(), $form->pcomment->getText()); + $this->_doc->payamount = 0 - \App\Entity\Pay::getPaymentAmount($this->_doc->document_id); + if ($this->_doc->payamount > $this->_doc->amount) { $this->setWarn('Сумма больше необходимой оплаты'); } $this->_doc->save(); - if ($this->_doc->datatag < $this->_doc->amount) { - //$this->_doc->updateStatus(Document::STATE_PART_PAYED); - } - if ($this->_doc->datatag == $this->_doc->amount) { - $this->_doc->updateStatus(Document::STATE_PAYED); - } + + $this->setSuccess('Оплата добавлена'); - if ($this->_doc->datatag == $this->_doc->amount) { + if ($this->_doc->payamount == $this->_doc->amount) { //закрываем если есть домтавка //$this->_doc->updateStatus(Document::STATE_CLOSED); @@ -282,7 +280,7 @@ private function getWhere() { $where .= " and state <>" . Document::STATE_EXECUTED; } if ($status == 2) { - $where .= " and amount > datatag"; + $where .= " and amount > payamount"; } if ($status == 3) { diff --git a/www/app/pages/register/ordercustlist.php b/www/app/pages/register/ordercustlist.php index 71c684dd8..335b4f05d 100644 --- a/www/app/pages/register/ordercustlist.php +++ b/www/app/pages/register/ordercustlist.php @@ -106,7 +106,7 @@ public function doclistOnRow($row) { public function statusOnSubmit($sender) { $state = $this->_doc->state; - $payed = $this->_doc->datatag >= $this->_doc->amount; //оплачен + $payed = $this->_doc->payamount >= $this->_doc->amount; //оплачен $ttn = false; //проверяем что есть ТТН $list = $this->_doc->ConnectedDocList(); @@ -137,7 +137,7 @@ public function statusOnSubmit($sender) { } if ($sender->id == "bclose") { - $this->_doc->datatag = $this->_doc->amount; + $this->_doc->payamount = $this->_doc->amount; $this->_doc->save(); $this->_doc->updateStatus(Document::STATE_CLOSED); @@ -157,7 +157,7 @@ public function updateStatusButtons() { $state = $this->_doc->state; - $payed = $this->_doc->datatag >= $this->_doc->amount; //оплачен + $payed = $this->_doc->payamount >= $this->_doc->amount; //оплачен //доставлен $sent = $this->_doc->checkStates(array(Document::STATE_DELIVERED)); @@ -174,7 +174,7 @@ public function updateStatusButtons() { $this->statuspan->statusform->bttn->setVisible(!$ttn); //отмена если не было оплат и доставки - if ($this->_doc->datatag == 0) { + if ($this->_doc->payamount == 0) { $this->statuspan->statusform->bcancel->setVisible(false); } else { $this->statuspan->statusform->bcancel->setVisible(true); diff --git a/www/app/pages/register/orderlist.php b/www/app/pages/register/orderlist.php index 0ea54c519..61ac79146 100644 --- a/www/app/pages/register/orderlist.php +++ b/www/app/pages/register/orderlist.php @@ -136,7 +136,7 @@ public function statusOnSubmit($sender) { if ($sender->id == "bclose") { - $this->_doc->datatag = $this->_doc->amount; + $this->_doc->payamount = $this->_doc->amount; $this->_doc->save(); $this->_doc->updateStatus(Document::STATE_CLOSED); @@ -302,7 +302,7 @@ private function getWhere() { $where .= " and state =1 "; } if ($status == 2) { - $where .= " and amount > datatag"; + $where .= " and amount > payamount"; } if ($status == 3) { diff --git a/www/app/pages/register/paylist.php b/www/app/pages/register/paylist.php new file mode 100644 index 000000000..68a8db7ea --- /dev/null +++ b/www/app/pages/register/paylist.php @@ -0,0 +1,199 @@ +add(new Form('filter'))->onSubmit($this, 'filterOnSubmit'); + $this->filter->add(new Date('from', time() - (7 * 24 * 3600))); + $this->filter->add(new Date('to', time() + (1 * 24 * 3600))); + $this->filter->add(new DropDownChoice('fmfund', \App\Entity\MoneyFund::getList(), 0)); + $this->filter->add(new DropDownChoice('fuser', \App\Entity\User::findArray('username', '', 'username'), 0)); + $this->filter->add(new AutocompleteTextInput('fcustomer'))->onText($this, 'OnAutoCustomer'); + + $doclist = $this->add(new DataView('doclist', new PayListDataSource($this), $this, 'doclistOnRow')); + + + $this->add(new Paginator('pag', $doclist)); + $doclist->setPageSize(25); + + + $this->add(new \App\Widgets\DocView('docview'))->setVisible(false); + + + $this->doclist->Reload(); + $this->add(new ClickLink('csv', $this, 'oncsv')); + } + + public function filterOnSubmit($sender) { + + + $this->docview->setVisible(false); + $this->doclist->Reload(); + } + + public function OnAutoCustomer($sender) { + $text = Customer::qstr('%' . $sender->getText() . '%'); + return Customer::findArray("customer_name", "customer_name like " . $text); + } + + public function doclistOnRow($row) { + $doc = $row->getDataItem(); + + $row->add(new Label('number', $doc->document_number)); + + $row->add(new Label('date', date('d-m-Y', strtotime($doc->paydate)))); + $row->add(new Label('notes', $doc->notes)); + $row->add(new Label('amountp', $doc->amount > 0 ? $doc->amount : "")); + $row->add(new Label('amountm', $doc->amount < 0 ? 0 - $doc->amount : "")); + + $row->add(new Label('mf_name', $doc->mf_name)); + $row->add(new Label('username', $doc->username)); + $row->add(new Label('customer_name', $doc->customer_name)); + + + + + $row->add(new ClickLink('show'))->onClick($this, 'showOnClick'); + } + + //просмотр + public function showOnClick($sender) { + + + $this->_doc = Document::load($sender->owner->getDataItem()->document_id); + + if (false == \App\ACL::checkShowDoc($this->_doc, true)) + return; + + $this->docview->setVisible(true); + $this->docview->setDoc($this->_doc); + } + + public function oncsv($sender) { + $list = $this->doclist->getDataSource()->getItems(-1, -1); + + $csv = "Дата;Счет;Приход;Расход;Документ;Создал;Контрагент;Примечание;"; + $csv .= "\n\n"; + + foreach ($list as $doc) { + + $csv .= date('Y.m.d', strtotime($doc->paydate)) . ';'; + $csv .= $doc->mf_name . ';'; + $csv .= ($doc->amount > 0 ? $doc->amount : "") . ';'; + $csv .= ($doc->amount < 0 ? 0 - $doc->amount : "" ) . ';'; + $csv .= $doc->document_number . ';'; + $csv .= $doc->username . ';'; + $csv .= $doc->customer_name . ';'; + $csv .= $doc->notes . ';'; + $csv .= "\n"; + } + $csv = mb_convert_encoding($csv, "windows-1251", "utf-8"); + + + header("Content-type: text/csv"); + header("Content-Disposition: attachment;Filename=baylist.csv"); + header("Content-Transfer-Encoding: binary"); + + echo $csv; + flush(); + die; + } + +} + +/** + * Источник данных для списка документов + */ +class PayListDataSource implements \Zippy\Interfaces\DataSource { + + private $page; + + public function __construct($page) { + $this->page = $page; + } + + private function getWhere() { + $user = System::getUser(); + + $conn = \ZDB\DB::getConnect(); + + $where = " date(paydate) >= " . $conn->DBDate($this->page->filter->from->getDate()) . " and date(paydate) <= " . $conn->DBDate($this->page->filter->to->getDate()); + + $author = $this->page->filter->fuser->getValue(); + $cust = $this->page->filter->fcustomer->getKey(); + $mf = $this->page->filter->fmfund->getValue(); + + + if ($cust > 0) { + $where .= " and d.customer_id=" . $cust; + } + if ($mf > 0) { + $where .= " and p.mf_id=" . $mf; + } + if ($author > 0) { + $where .= " and p.user_id=" . $author; + } + if ($user->acltype == 2) { + $where .= " and d.meta_id in({$user->aclview}) "; + } + return $where; + } + + public function getItemCount() { + $conn = \ZDB\DB::getConnect(); + $sql = "select coalesce(count(*),0) from documents_view d join `paylist_view` p on d.`document_id` = p.`document_id` where " . $this->getWhere(); + return $conn->GetOne($sql); + } + + public function getItems($start, $count, $sortfield = null, $asc = null) { + + $conn = \ZDB\DB::getConnect(); + $sql = "select p.*,d.`customer_name`,d.`meta_id` from documents_view d join `paylist_view` p on d.`document_id` = p.`document_id` where " . $this->getWhere() . " order by pl_id desc "; + if ($count > 0) + $sql .= " limit {$start},{$count}"; + + $docs = Document::findBySql($sql); + + return $docs; + } + + public function getItem($id) { + + } + +} diff --git a/www/app/pages/register/prodlist.php b/www/app/pages/register/prodlist.php index 5cf28a3c8..af9c7ed28 100644 --- a/www/app/pages/register/prodlist.php +++ b/www/app/pages/register/prodlist.php @@ -26,7 +26,6 @@ class ProdList extends \App\Pages\Base { private $_doc = null; - /** * @@ -43,8 +42,8 @@ public function __construct() { $this->filter->add(new Date('to', time() + (1 * 24 * 3600))); $this->filter->add(new DropDownChoice('parea', \App\Entity\Prodarea::findArray("pa_name", ""), 0)); - - + + $doclist = $this->add(new DataView('doclist', new ProdDataSource($this), $this, 'doclistOnRow')); $doclist->setSelectedClass('table-success'); @@ -54,17 +53,17 @@ public function __construct() { $this->add(new \App\Widgets\DocView('docview'))->setVisible(false); - - + + $this->doclist->Reload(); $this->add(new ClickLink('csv', $this, 'oncsv')); } public function filterOnSubmit($sender) { - - $this->docview->setVisible(false); + + $this->docview->setVisible(false); $this->doclist->Reload(); } @@ -76,18 +75,15 @@ public function doclistOnRow($row) { $row->add(new Label('date', date('d-m-Y', $doc->document_date))); $row->add(new Label('onotes', $doc->notes)); $row->add(new Label('amount', $doc->amount)); - + $row->add(new Label('pareaname', $doc->headerdata["pareaname"])); - + $row->add(new ClickLink('show'))->onClick($this, 'showOnClick'); $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); - } - - //просмотр public function showOnClick($sender) { @@ -96,7 +92,7 @@ public function showOnClick($sender) { return; $this->doclist->setSelectedRow($sender->getOwner()); $this->doclist->Reload(false); - $this->docview->setVisible(true); + $this->docview->setVisible(true); $this->docview->setDoc($this->_doc); } @@ -106,11 +102,9 @@ public function editOnClick($sender) { return; - App::Redirect("\\App\\Pages\\Doc\\".$doc->meta_name, $doc->document_id); + App::Redirect("\\App\\Pages\\Doc\\" . $doc->meta_name, $doc->document_id); } - - public function oncsv($sender) { $list = $this->doclist->getDataSource()->getItems(-1, -1, 'document_id'); $csv = ""; @@ -161,13 +155,12 @@ private function getWhere() { $parea = $this->page->filter->parea->getValue(); - if($parea >0){ - $where .= " and content like '%{$parea}%' "; - + if ($parea > 0) { + $where .= " and content like '%{$parea}%' "; } - - + + if ($user->acltype == 2) { diff --git a/www/app/pages/register/stocklist.php b/www/app/pages/register/stocklist.php index e19710fe0..e689d4fc0 100644 --- a/www/app/pages/register/stocklist.php +++ b/www/app/pages/register/stocklist.php @@ -22,6 +22,7 @@ class StockList extends \App\Pages\Base { public $_item; + public function __construct() { parent::__construct(); if (false == \App\ACL::checkShowReg('StockList')) @@ -30,9 +31,9 @@ public function __construct() { $this->add(new Form('filter'))->onSubmit($this, 'OnFilter'); $this->filter->add(new TextInput('searchkey')); $this->filter->add(new DropDownChoice('searchcat', Category::findArray("cat_name", "", "cat_name"), 0)); - - $this->add(new Panel('itempanel')) ; + + $this->add(new Panel('itempanel')); $this->itempanel->add(new DataView('itemlist', new ItemDataSource($this), $this, 'itemlistOnRow')); $this->itempanel->itemlist->setPageSize(25); @@ -42,54 +43,48 @@ public function __construct() { $this->itempanel->itemlist->Reload(); $this->itempanel->add(new ClickLink('csv', $this, 'oncsv')); - - + + $this->add(new Panel('detailpanel'))->setVisible(false); $this->detailpanel->add(new ClickLink('back'))->onClick($this, 'backOnClick'); $this->detailpanel->add(new Label('itemdetname')); $this->detailpanel->add(new DataView('stocklist', new DetailDataSource($this), $this, 'detailistOnRow')); - } public function itemlistOnRow($row) { $item = $row->getDataItem(); - + $row->add(new Label('itemname', $item->itemname)); $row->add(new Label('code', $item->item_code)); $row->add(new Label('msr', $item->msr)); - - $row->add(new Label('qty',H::fqty($item->qty))); - - + + $row->add(new Label('qty', H::fqty($item->qty))); + + $row->add(new Label('cat_name', $item->cat_name)); $row->add(new ClickLink('show'))->onClick($this, 'showOnClick'); - - - } - + public function OnFilter($sender) { $this->itempanel->itemlist->Reload(); } - - + public function detailistOnRow($row) { $stock = $row->getDataItem(); $row->add(new Label('storename', $stock->storename)); $row->add(new Label('snumber', $stock->snumber)); $row->add(new Label('sdate', '')); - + $row->add(new Label('sedate', '')); - - - - if(strlen($stock->snumber)>0 ){ - $row->sdate->setText(date('Y-m-d',$stock->sdate)); - if($this->_item->term>0){ - $term = strtotime("+{$this->_item->term} month",$stock->sdate); - $row->sedate->setText(date('Y-m-d',$term)); - + + + + if (strlen($stock->snumber) > 0) { + $row->sdate->setText(date('Y-m-d', $stock->sdate)); + if ($this->_item->term > 0) { + $term = strtotime("+{$this->_item->term} month", $stock->sdate); + $row->sedate->setText(date('Y-m-d', $term)); } } $row->add(new Label('partion', $stock->partion)); @@ -110,7 +105,7 @@ public function detailistOnRow($row) { $row->add(new Label('amount', round($stock->qty * $stock->partion))); $item = Item::load($stock->item_id); - + $plist = array(); if ($item->price1 > 0) @@ -128,33 +123,32 @@ public function detailistOnRow($row) { } public function backOnClick($sender) { - - $this->itempanel->setVisible(true); - $this->detailpanel->setVisible(false); - + + $this->itempanel->setVisible(true); + $this->detailpanel->setVisible(false); } + public function showOnClick($sender) { - $this->_item = $sender->getOwner()->getDataItem(); - $this->itempanel->setVisible(false); - $this->detailpanel->setVisible(true); - $this->detailpanel->itemdetname->setText($this->_item->itemname); - $this->detailpanel->stocklist->Reload(); + $this->_item = $sender->getOwner()->getDataItem(); + $this->itempanel->setVisible(false); + $this->detailpanel->setVisible(true); + $this->detailpanel->itemdetname->setText($this->_item->itemname); + $this->detailpanel->stocklist->Reload(); } - public function oncsv($sender) { $list = $this->itempanel->itemlist->getDataSource()->getItems(-1, -1, 'itemname'); $csv = ""; foreach ($list as $st) { - + $csv .= $st->itemname . ';'; $csv .= $st->item_code . ';'; - + $csv .= $st->msr . ';'; $csv .= $st->cat_name . ';'; $csv .= H::fqty($st->qty) . ';'; - + $csv .= "\n"; } $csv = mb_convert_encoding($csv, "windows-1251", "utf-8"); @@ -171,7 +165,6 @@ public function oncsv($sender) { } - class ItemDataSource implements \Zippy\Interfaces\DataSource { private $page; @@ -186,8 +179,8 @@ private function getWhere() { $form = $this->page->filter; $where = " qty>0 and disabled <> 1 "; - - + + $cat = $form->searchcat->getValue(); @@ -198,20 +191,20 @@ private function getWhere() { if (strlen($text) > 0) { $form->searchcat->setValue(0); //поиск независимо от категории $text = Stock::qstr('%' . $text . '%'); - $where = " (itemname like {$text} or item_code like {$text} ) "; + $where = " (itemname like {$text} or item_code like {$text} ) "; } - - + + return $where; } - public function getItemCount() { + public function getItemCount() { return Item::findCnt($this->getWhere()); } public function getItems($start, $count, $sortfield = null, $asc = null) { - return Item::find($this->getWhere(), "itemname asc", $count, $start); + return Item::find($this->getWhere(), "itemname asc", $count, $start); } public function getItem($id) { @@ -229,21 +222,21 @@ public function __construct($page) { } private function getWhere() { - + $form = $this->page->filter; $where = "item_id = {$this->page->_item->item_id} and (qty <> 0 or rqty <> 0 or wqty <> 0) "; - - + + return $where; } - public function getItemCount() { + public function getItemCount() { return Stock::findCnt($this->getWhere()); } public function getItems($start, $count, $sortfield = null, $asc = null) { - return Stock::find($this->getWhere(), "", $count, $start); + return Stock::find($this->getWhere(), "", $count, $start); } public function getItem($id) { diff --git a/www/app/pages/register/tasklist.php b/www/app/pages/register/tasklist.php index 051a7a780..fd1327249 100644 --- a/www/app/pages/register/tasklist.php +++ b/www/app/pages/register/tasklist.php @@ -141,17 +141,17 @@ public function tasklistOnRow($row) { $row->add(new Label('taskemps', implode(', ', $emps))); $row->add(new Label('taskclient', $task->customer_name)); $row->add(new Label('taskamount', $task->amount)); - $row->add(new Label('taskdebet', $task->amount - $task->datatag)); + $row->add(new Label('taskdebet', $task->amount - $task->payamount)); $this->_tamount = $this->_tamount + $task->amount; - $this->_tdebet = $this->_tdebet + $task->amount - $task->datatag; + $this->_tdebet = $this->_tdebet + $task->amount - $task->payamount; $row->add(new ClickLink('taskshow'))->onClick($this, 'taskshowOnClick'); $row->add(new ClickLink('taskedit'))->onClick($this, 'taskeditOnClick'); $row->add(new ClickLink('taskpay'))->onClick($this, 'taskpayOnClick'); - if ($task->state == Document::STATE_CLOSED){ - $row->taskedit->setVisible(false); - } + if ($task->state == Document::STATE_CLOSED) { + $row->taskedit->setVisible(false); + } } //панель кнопок @@ -184,8 +184,6 @@ public function taskshowOnClick($sender) { } - - $this->statuspan->docview->setDoc($this->_task); $this->tasklist->setSelectedRow($sender->getOwner()); $this->tasklist->Reload(false); @@ -211,16 +209,9 @@ public function onStatus($sender) { } if ($sender->id == 'bclosed') { $this->_task->updateStatus(Document::STATE_EXECUTED); - if ($this->_task->amount == $this->_task->datatag) { //если оплачен + if ($this->_task->amount == $this->_task->payamount) { //если оплачен $this->_task->updateStatus(Document::STATE_CLOSED); $this->setSuccess('Наряд закрыт'); - } else { - if ($this->_task->datatag == 0) { - $this->_task->updateStatus(Document::STATE_WP); - } - if ($this->_task->datatag > 0) { - // $this->_task->updateStatus(Document::STATE_PART_PAYED); - } } } @@ -241,7 +232,7 @@ public function taskpayOnClick($sender) { $this->goAnkor('dankor'); - $this->paypan->payform->pamount->setText($this->_task->amount - $this->_task->datatag); + $this->paypan->payform->pamount->setText($this->_task->amount - $this->_task->payamount); ; $this->paypan->payform->pcomment->setText(""); ; @@ -270,20 +261,18 @@ public function payOnSubmit($sender) { return; $this->_task->addPayment(System::getUser()->getUserName(), $amount, $form->pcomment->getText()); - $this->_task->datatag += $amount; - if ($this->_task->datatag > $this->_task->amount) { + $this->_task->payamount += $amount; + if ($this->_task->payamount > $this->_task->amount) { $this->setWarn('Сумма больше необходимой оплаты'); } $this->_task->save(); - if ($this->_task->datatag < $this->_task->amount) { + if ($this->_task->payamount < $this->_task->amount) { // $this->_task->updateStatus(Document::STATE_PART_PAYED); } - if ($this->_task->datatag == $this->_task->amount) { - $this->_task->updateStatus(Document::STATE_PAYED); - } + $this->setSuccess('Оплата добавлена'); - if ($this->_task->datatag == $this->_task->amount && $this->_task->checkStates(array(Document::STATE_EXECUTED))) { + if ($this->_task->payamount == $this->_task->amount && $this->_task->checkStates(array(Document::STATE_EXECUTED))) { //закрываем если был выполнен $this->_task->updateStatus(Document::STATE_CLOSED); $this->setSuccess('Наряд оплаче и закрыт'); @@ -350,7 +339,7 @@ public function updateCal() { $col = "#ffc107"; if ($item->state == Document::STATE_CLOSED) $col = "#dddddd"; - if ($item->state == Document::STATE_CLOSED && $item->amount > $task->datatag) + if ($item->state == Document::STATE_CLOSED && $item->amount > $task->payamount) $col = "#ff0000"; diff --git a/www/app/pages/report/itemactivity.php b/www/app/pages/report/itemactivity.php index 82d0b6b66..8b4890a40 100644 --- a/www/app/pages/report/itemactivity.php +++ b/www/app/pages/report/itemactivity.php @@ -92,19 +92,19 @@ private function generateReport() { $storeid = $this->filter->store->getValue(); $itemid = $this->filter->item->getKey(); - $snumber= $this->filter->snumber->getText(); - - $it = "1=1"; - if($itemid > 0 ){ - $it .= " and st.item_id=" . $itemid ; - } - if(strlen($snumber) > 0 ){ - $it .= " and st.snumber=" . Stock::qstr($snumber) ; - } - + $snumber = $this->filter->snumber->getText(); + + $it = "1=1"; + if ($itemid > 0) { + $it .= " and st.item_id=" . $itemid; + } + if (strlen($snumber) > 0) { + $it .= " and st.snumber=" . Stock::qstr($snumber); + } + $from = $this->filter->from->getDate(); $to = $this->filter->to->getDate(); - + $i = 1; $detail = array(); $conn = \ZDB\DB::getConnect(); @@ -137,7 +137,7 @@ private function generateReport() { date(sc.document_date) AS dt, SUM(CASE WHEN quantity > 0 THEN quantity ELSE 0 END) AS obin, SUM(CASE WHEN quantity < 0 THEN 0 - quantity ELSE 0 END) AS obout, - GROUP_CONCAT(dc.document_number) AS docs + GROUP_CONCAT(distinct dc.document_number) AS docs FROM entrylist_view sc JOIN store_stock_view st ON sc.stock_id = st.stock_id @@ -159,7 +159,7 @@ private function generateReport() { $detail[] = array( "code" => $row['item_code'], "name" => $row['itemname'], - "date" => date("d.m.Y", strtotime($row['dt'])), + "date" => date("Y-m-d", strtotime($row['dt'])), "documents" => $row['docs'], "in" => H::fqty(strlen($row['begin_quantity']) > 0 ? $row['begin_quantity'] : 0), "obin" => H::fqty($row['obin']), diff --git a/www/app/pages/report/payactivity.php b/www/app/pages/report/payactivity.php new file mode 100644 index 000000000..fc88dbb5a --- /dev/null +++ b/www/app/pages/report/payactivity.php @@ -0,0 +1,178 @@ +add(new Form('filter'))->onSubmit($this, 'OnSubmit'); + $this->filter->add(new Date('from', time() - (7 * 24 * 3600))); + $this->filter->add(new Date('to', time())); + $this->filter->add(new DropDownChoice('mf', MoneyFund::getList(), H::getDefMF())); + + + $this->add(new \Zippy\Html\Link\ClickLink('autoclick'))->onClick($this, 'OnAutoLoad', true); + + $this->add(new Panel('detail'))->setVisible(false); + $this->detail->add(new RedirectLink('print', "mfreport")); + $this->detail->add(new RedirectLink('html', "mfreport")); + $this->detail->add(new RedirectLink('word', "mfreport")); + $this->detail->add(new RedirectLink('excel', "mfreport")); + $this->detail->add(new RedirectLink('pdf', "mfreport")); + $this->detail->add(new Label('preview')); + \App\Session::getSession()->issubmit = false; + } + + public function OnSubmit($sender) { + + + + $html = $this->generateReport(); + $this->detail->preview->setText($html, true); + \App\Session::getSession()->printform = "" . $html . ""; + + // \ZippyERP\System\Session::getSession()->storereport = "" . $html . ""; + $reportpage = "App/Pages/ShowReport"; + $reportname = "mfreport"; + + + $this->detail->print->pagename = $reportpage; + $this->detail->print->params = array('print', $reportname); + $this->detail->html->pagename = $reportpage; + $this->detail->html->params = array('html', $reportname); + $this->detail->word->pagename = $reportpage; + $this->detail->word->params = array('doc', $reportname); + $this->detail->excel->pagename = $reportpage; + $this->detail->excel->params = array('xls', $reportname); + $this->detail->pdf->pagename = $reportpage; + $this->detail->pdf->params = array('pdf', $reportname); + + $this->detail->setVisible(true); + + $this->detail->preview->setText("Загрузка...", true); + \App\Session::getSession()->printform = ""; + \App\Session::getSession()->issubmit = true; + } + + private function generateReport() { + + $mf_id = $this->filter->mf->getValue(); + + + $from = $this->filter->from->getDate(); + $to = $this->filter->to->getDate(); + + $i = 1; + $detail = array(); + $conn = \ZDB\DB::getConnect(); + + $sql = " + SELECT t.*, + + ( + SELECT + + COALESCE(SUM(sc2.`amount`), 0) + FROM paylist_view sc2 + + WHERE + sc2.mf_id = {$mf_id} + + AND sc2.paydate < t.dt + + + ) as begin_amount + + from ( + select + + date(sc.paydate) AS dt, + SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) AS obin, + SUM(CASE WHEN amount < 0 THEN 0 - amount ELSE 0 END) AS obout, + GROUP_CONCAT(distinct sc.document_number) AS docs + FROM paylist_view sc + WHERE + sc.mf_id = {$mf_id} + AND DATE(sc.paydate) >= " . $conn->DBDate($from) . " + AND DATE(sc.paydate) <= " . $conn->DBDate($to) . " + GROUP BY + DATE(sc.paydate) ) t + ORDER BY t.dt + "; + + + $rs = $conn->Execute($sql); + + $tend = 0; + $tin = 0; + $tout = 0; + foreach ($rs as $row) { + + + $detail[] = array( + "date" => date("Y-m-d", strtotime($row['dt'])), + "documents" => $row['docs'], + "in" => strlen($row['begin_amount']) > 0 ? $row['begin_amount'] : 0, + "obin" => $row['obin'], + "obout" => $row['obout'], + "out" => $row['begin_amount'] + $row['obin'] - $row['obout'] + ); + $tend = $row['begin_amount'] + $row['obin'] - $row['obout']; + $tin += $row['obin']; + $tout += $row['obout']; + } + $tb = $tend - $tin + $tout; + + $header = array('datefrom' => date('d.m.Y', $from), + "_detail" => $detail, + 'tb' => $tb, + 'tin' => $tin, + 'tout' => $tout, + 'tend' => $tend, + 'dateto' => date('d.m.Y', $to), + "mf_name" => MoneyFund::load($mf_id)->mf_name + ); + $report = new \App\Report('payactivity.tpl'); + + $html = $report->generate($header); + + return $html; + } + + public function OnAutoLoad($sender) { + + if (\App\Session::getSession()->issubmit === true) { + $html = $this->generateReport(); + \App\Session::getSession()->printform = "" . $html . ""; + $this->detail->preview->setText($html, true); + $this->updateAjax(array('preview')); + } + } + + public function beforeRender() { + parent::beforeRender(); + + App::addJavaScript("\$('#autoclick').click()", true); + } + +} diff --git a/www/app/pages/report/prod.php b/www/app/pages/report/prod.php index 53e6c3698..2c1ebebd6 100644 --- a/www/app/pages/report/prod.php +++ b/www/app/pages/report/prod.php @@ -26,7 +26,7 @@ public function __construct() { $this->add(new Form('filter'))->onSubmit($this, 'OnSubmit'); $this->filter->add(new Date('from', time() - (7 * 24 * 3600))); $this->filter->add(new Date('to', time())); - $this->filter->add(new DropDownChoice('parea', \App\Entity\Prodarea::findArray("pa_name", ""), 0)); + $this->filter->add(new DropDownChoice('parea', \App\Entity\Prodarea::findArray("pa_name", ""), 0)); $this->add(new Panel('detail'))->setVisible(false); $this->detail->add(new RedirectLink('print', "movereport")); @@ -78,11 +78,11 @@ private function generateReport() { $sum2 = 0; $conn = \ZDB\DB::getConnect(); - $wparea = ""; - if($parea >0){ - $wparea = " and content like '%{$parea}%' "; + $wparea = ""; + if ($parea > 0) { + $wparea = " and content like '%{$parea}%' "; } - + $sql = " select i.`itemname`,i.`item_code`,0-sum(e.`quantity`) as qty, 0-sum(e.`amount`) as summa from `entrylist_view` e @@ -145,8 +145,8 @@ private function generateReport() { 'sum1' => $sum1, 'sum2' => $sum2 ); - if($parea >0){ - $header['parea'] = $this->filter->parea->getValueName() ; + if ($parea > 0) { + $header['parea'] = $this->filter->parea->getValueName(); } $report = new \App\Report('prod.tpl'); diff --git a/www/app/pages/users.php b/www/app/pages/users.php index 574f46db5..9eb37eee7 100644 --- a/www/app/pages/users.php +++ b/www/app/pages/users.php @@ -55,7 +55,7 @@ public function __construct() { //модули $this->editpan->editform->add(new CheckBox('editocstore')); $this->editpan->editform->add(new CheckBox('editshop')); - + @@ -102,15 +102,13 @@ public function onEdit($sender) { $this->editpan->editform->editwminqty->setChecked(true); if (strpos($this->user->widgets, 'wsdate') !== false) $this->editpan->editform->editwsdate->setChecked(true); - if (strpos($this->user->widgets, 'wrdoc') !== false) + if (strpos($this->user->widgets, 'wrdoc') !== false) $this->editpan->editform->editwrdoc->setChecked(true); if (strpos($this->user->modules, 'ocstore') !== false) $this->editpan->editform->editocstore->setChecked(true); if (strpos($this->user->modules, 'shop') !== false) $this->editpan->editform->editshop->setChecked(true); - - } public function saveOnClick($sender) { @@ -171,22 +169,22 @@ public function saveOnClick($sender) { $widgets = $widgets . ',wnoliq'; if ($this->editpan->editform->editwminqty->isChecked()) $widgets = $widgets . ',wminqty'; - if ($this->editpan->editform->editwsdate->isChecked()) + if ($this->editpan->editform->editwsdate->isChecked()) $widgets = $widgets . ',wsdate'; - if ($this->editpan->editform->editwrdoc->isChecked()) + if ($this->editpan->editform->editwrdoc->isChecked()) $widgets = $widgets . ',wrdoc'; $this->user->widgets = trim($widgets, ','); - + $modules = ""; if ($this->editpan->editform->editshop->isChecked()) $modules = $modules . ',shop'; if ($this->editpan->editform->editocstore->isChecked()) $modules = $modules . ',ocstore'; - + $this->user->modules = trim($modules, ','); - + $this->user->save(); $this->listpan->userrow->Reload(); $this->listpan->setVisible(true); @@ -209,11 +207,11 @@ public function onAcl($sender) { public function OnRemove($sender) { $user = $sender->getOwner()->getDataItem(); $del = User::delete($user->user_id); - if(strlen($del) > 0){ - $this->setError($del) ; + if (strlen($del) > 0) { + $this->setError($del); return; - } - + } + $this->listpan->userrow->Reload(); } diff --git a/www/app/widgets/docview.php b/www/app/widgets/docview.php index ffdb4f635..63567b3a8 100644 --- a/www/app/widgets/docview.php +++ b/www/app/widgets/docview.php @@ -65,8 +65,6 @@ public function setDoc(\App\Entity\Doc\Document $doc) { $this->_doc = $doc; $doc = $this->_doc->cast(); - - $html = $doc->generateReport(); $this->preview->setText($html, true); // проверяем поддержку экспорта @@ -98,7 +96,7 @@ public function setDoc(\App\Entity\Doc\Document $doc) { $this->dw_statelist->Reload(); //оплаты - $this->_paylist = $this->_doc->getPayments(); + $this->_paylist = \App\Entity\Pay::getPayments($this->_doc->document_id); $this->dw_paylist->Reload(); //список приатаченных файлов @@ -147,9 +145,11 @@ public function stateListOnRow($row) { public function payListOnRow($row) { $item = $row->getDataItem(); $row->add(new Label('paydate', date('Y-m-d', $item->paydate))); - $row->add(new Label('payamount', $item->amount)); + $row->add(new Label('payamountp', $item->amount > 0 ? $item->amount : "")); + $row->add(new Label('payamountm', $item->amount < 0 ? 0 - $item->amount : "")); $row->add(new Label('payuser', $item->username)); $row->add(new Label('paycomment', $item->notes)); + $row->add(new Label('paymf', $item->mf_name)); } /** diff --git a/www/app/widgets/wdebitors.php b/www/app/widgets/wdebitors.php index b4f7423de..1d2139472 100644 --- a/www/app/widgets/wdebitors.php +++ b/www/app/widgets/wdebitors.php @@ -27,10 +27,10 @@ public function __construct($id) { $conn = $conn = \ZDB\DB::getConnect(); $sql = "select * from ( - select meta_desc,document_number, customer_name, ( datatag-amount) as am - from `documents_view` where meta_name in ('GoodsIssue','GoodsReceipt','Task','ServiceAct') and amount > datatag + select meta_desc,document_number, customer_name, ( amount - payamount) as am + from `documents_view` where amount > 0 and amount <> payamount and state not in (1,2,3,17) and meta_name in('GoodsReceipt','GoodsIssue','Task','ServiceAct') - ) t order by am "; + ) t order by am desc "; if ($visible) { @@ -43,7 +43,7 @@ public function __construct($id) { $list = $this->add(new DataView('ddoclist', new ArrayDataSource($data), $this, 'OnRow')); $list->Reload(); - $list->setPageSize(10); + $list->setPageSize(10); $this->add(new \Zippy\Html\DataList\Paginator("wdpag", $list)); $list->Reload(); if (count($data) == 0 || $visible == false) { @@ -55,7 +55,7 @@ public function OnRow($row) { $item = $row->getDataItem(); $row->add(new Label('cust', $item->customer_name)); - $row->add(new Label('amount', 0 - ($item->am))); + $row->add(new Label('amount', $item->am)); $row->add(new Label('type', $item->meta_desc)); $row->add(new Label('number', $item->document_number)); } diff --git a/www/app/widgets/wminqty.php b/www/app/widgets/wminqty.php index eadd9204b..3bdbea8fb 100644 --- a/www/app/widgets/wminqty.php +++ b/www/app/widgets/wminqty.php @@ -16,8 +16,7 @@ /** * Виджет для минимального количества на складе */ -class WMinQty extends \Zippy\Html\PageFragment -{ +class WMinQty extends \Zippy\Html\PageFragment { public function __construct($id) { parent::__construct($id); @@ -39,7 +38,7 @@ public function __construct($id) { foreach ($rs as $row) { $data[$row['item_id']] = new DataItem($row); - } + } } $mqlist = $this->add(new DataView('mqlist', new ArrayDataSource($data), $this, 'mqlistOnRow')); diff --git a/www/app/widgets/wnoliq.php b/www/app/widgets/wnoliq.php index 21b56988f..1a47a2bb4 100644 --- a/www/app/widgets/wnoliq.php +++ b/www/app/widgets/wnoliq.php @@ -16,8 +16,7 @@ /** * Виджет для просмотра неликвидных товаров */ -class WNoliq extends \Zippy\Html\PageFragment -{ +class WNoliq extends \Zippy\Html\PageFragment { public function __construct($id) { parent::__construct($id); diff --git a/www/app/widgets/wplanneddocs.php b/www/app/widgets/wplanneddocs.php index b149fb543..af5059d3e 100644 --- a/www/app/widgets/wplanneddocs.php +++ b/www/app/widgets/wplanneddocs.php @@ -29,7 +29,7 @@ public function __construct($id) { // список запланированных документов $where = "state not in( " . Document::STATE_CANCELED . "," . Document::STATE_EDITED . "," . Document::STATE_NEW . ") "; $where = $where . " and document_date >= " . $conn->DBDate(strtotime('-5 days')); - // $where = $where . " and meta_name in ('ServiceAct','GoodsIssue','GoodsReceipt') "; + // $where = $where . " and meta_name in ('ServiceAct','GoodsIssue','GoodsReceipt') "; $where = $where . " and content like '%1%'"; if ($visible) { $data = Document::find($where, "document_date desc"); @@ -49,7 +49,7 @@ public function doclistOnRow($row) { $item = $row->getDataItem(); $item = $item->cast(); $dt = date('d-m-Y', $item->document_date); - $row->add(new \Zippy\Html\Link\RedirectLink("number","\\App\\Pages\\Register\\DocList",$item->document_id))->setValue($item->document_number); + $row->add(new \Zippy\Html\Link\RedirectLink("number", "\\App\\Pages\\Register\\DocList", $item->document_id))->setValue($item->document_number); $row->add(new Label('date', $dt)); $row->add(new Label('type', $item->meta_desc)); diff --git a/www/app/widgets/wrdoc.php b/www/app/widgets/wrdoc.php index acbeac810..918cbe3f2 100644 --- a/www/app/widgets/wrdoc.php +++ b/www/app/widgets/wrdoc.php @@ -27,20 +27,19 @@ public function __construct($id) { $data = array(); if ($visible) { - $sql="select distinct document_id,meta_desc,document_number from docstatelog_view where user_id={$user->user_id} and createdon > ". $conn->DBDate(strtotime("-1 month",time())) ." order by log_id"; - - + $sql = "select distinct document_id,meta_desc,document_number from docstatelog_view where user_id={$user->user_id} and createdon > " . $conn->DBDate(strtotime("-1 month", time())) . " order by log_id"; + + $rc = $conn->Execute($sql); - - foreach($rc as $row){ - $data[] = new \App\DataItem($row) ; - + + foreach ($rc as $row) { + $data[] = new \App\DataItem($row); } } $doclist = $this->add(new DataView('rdoclist', new ArrayDataSource($data), $this, 'doclistOnRow')); - - + + $doclist->Reload(); if (count($data) == 0 || $visible == false) { @@ -50,15 +49,12 @@ public function __construct($id) { public function doclistOnRow($row) { $item = $row->getDataItem(); - - - - - $row->add(new Label('type', $item->meta_desc)); - $row->add(new \Zippy\Html\Link\RedirectLink("number","\\App\\Pages\\Register\\DocList",$item->document_id))->setValue($item->document_number); - - + + + + $row->add(new Label('type', $item->meta_desc)); + $row->add(new \Zippy\Html\Link\RedirectLink("number", "\\App\\Pages\\Register\\DocList", $item->document_id))->setValue($item->document_number); } } diff --git a/www/app/widgets/wsdate.php b/www/app/widgets/wsdate.php index fc1101050..8dcb8f22e 100644 --- a/www/app/widgets/wsdate.php +++ b/www/app/widgets/wsdate.php @@ -17,8 +17,7 @@ /** * Виджет для просроченных товаров */ -class Wsdate extends \Zippy\Html\PageFragment -{ +class Wsdate extends \Zippy\Html\PageFragment { public function __construct($id) { parent::__construct($id); @@ -28,27 +27,26 @@ public function __construct($id) { $conn = $conn = \ZDB\DB::getConnect(); $data = array(); - - - + + + if ($visible) { - $items= Item::find("item_id in(select item_id from store_stock where sdate is not null)"); - - $stock= Stock::find("sdate is not null"); + $items = Item::find("item_id in(select item_id from store_stock where sdate is not null)"); + + $stock = Stock::find("sdate is not null"); foreach ($stock as $st) { - $item = $items[$st->item_id] ; - if($item->term >0){ - $edate = strtotime("+{$item->term} month",$st->sdate); - if($edate < time()){ + $item = $items[$st->item_id]; + if ($item->term > 0) { + $edate = strtotime("+{$item->term} month", $st->sdate); + if ($edate < time()) { $st->edate = $edate; - $data[$row['item_id']] = $st; - } - } - - } + $data[$row['item_id']] = $st; + } + } + } } $sdlist = $this->add(new DataView('sdlist', new ArrayDataSource($data), $this, 'sdlistOnRow')); @@ -58,7 +56,7 @@ public function __construct($id) { unset($items); unset($stock); - + if (count($data) == 0 || $visible == false) { $this->setVisible(false); }; @@ -70,9 +68,8 @@ public function sdlistOnRow($row) { $row->add(new Label('storename', $stock->storename)); $row->add(new Label('itemname', $stock->itemname)); $row->add(new Label('snumber', $stock->snumber)); - $row->add(new Label('edate', date('Y-m-d',$stock->edate))); - $row->add(new Label('qty', Helper::fqty($stock->qty))) ; - + $row->add(new Label('edate', date('Y-m-d', $stock->edate))); + $row->add(new Label('qty', Helper::fqty($stock->qty))); } } diff --git a/www/templates/index.html b/www/templates/index.html index 7292b29ac..f81e9ddd4 100644 --- a/www/templates/index.html +++ b/www/templates/index.html @@ -1,12 +1,12 @@ - - - + + + - - Страница не найдена. Перейдите на главную - + + Страница не найдена. Перейдите на главную + \ No newline at end of file diff --git a/www/templates/modules/ocstore/items.html b/www/templates/modules/ocstore/items.html index 3791f36de..631a149f7 100644 --- a/www/templates/modules/ocstore/items.html +++ b/www/templates/modules/ocstore/items.html @@ -1,110 +1,110 @@ - - - -
    + + + +

    Экспорт новых товаров

    - - - - + + + +
    - +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    НаименованиеАртикулКол.Цена Описание
    -
    - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    НаименованиеАртикулКол.Цена Описание
    +
    + + - +   - -
    - + +
    +

    Обновление цен и количеств

    - +
    - Обновить количества - -    - Обновить цены - - - + Обновить количества + +    + Обновить цены + + +
    - -
    + +

    Загрузка товаров с магазина

    - +
    - Загрузить - - - + Загрузить + + +
    -
    - - +
    + + diff --git a/www/templates/modules/ocstore/options.html b/www/templates/modules/ocstore/options.html index 268625b91..0d9924e11 100644 --- a/www/templates/modules/ocstore/options.html +++ b/www/templates/modules/ocstore/options.html @@ -1,59 +1,59 @@ - + - +

    Настройки соединения

    -
    - - -
    -
    - - -
    -
    - - -
    +
    + + +
    +
    + + +
    +
    + + +
    - - - Условный контрагент от имени котрого будут формироватся заказы - + + Условный контрагент от имени котрого будут формироватся заказы +
    - - - + + +
    -
    - - - - -
    +
    + + + + +
    -
    - - - +
    + + + diff --git a/www/templates/modules/ocstore/orders.html b/www/templates/modules/ocstore/orders.html index 4b77fea95..b96178866 100644 --- a/www/templates/modules/ocstore/orders.html +++ b/www/templates/modules/ocstore/orders.html @@ -1,8 +1,8 @@ - - - -
    + + + +

    Импорт заказов

    @@ -14,46 +14,46 @@

    Импорт заказов

    - + - + - - + +
    - + - + - + - - - + + + - + - + - - + + @@ -61,67 +61,67 @@

    Импорт заказов

    Номер ДатаКлиент Сумма Комментарий
    Импортировать - +
    -
    +

    Экспорт статусов в магазин

    Обновить - +
    -
    - - - - - - - - - - - - - - - - - - - - - - - + +
    НомерOC НомерДатаКлиентСумма Статус
    + + + + + - + + + + + + + + + + + + + + + + + + + +
    НомерOC НомерДата
    КлиентСумма Статус
    + + +
    + - - - -
    - - - + - -
    - - + +
    + +
    - + - + diff --git a/www/templates/modules/shop/pages/base.html b/www/templates/modules/shop/pages/base.html index aa3e7c7ce..80f71b6f7 100644 --- a/www/templates/modules/shop/pages/base.html +++ b/www/templates/modules/shop/pages/base.html @@ -62,9 +62,9 @@
    - + - +
    diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html index 0ed93f3ce..0a03e8104 100644 --- a/www/templates/pages/base.html +++ b/www/templates/pages/base.html @@ -115,7 +115,7 @@

    Zippy Скла
      -
    • +
      • - - {{#modules}} + + {{#modules}}
      • - {{/modules}} + {{/modules}}
    • -
      - - -
      +
      + + +
      + +
      + + +
      @@ -96,11 +103,11 @@

      Расходная накладная

      Название Код Ед. - {{#usesnumber}} + {{#usesnumber}} Серия Дата - {{/usesnumber}} - + {{/usesnumber}} + Уч. цена Кол. @@ -113,11 +120,11 @@

      Расходная накладная

      - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} - + {{/usesnumber}} + @@ -128,14 +135,14 @@

      Расходная накладная

      - - {{^usesnumber}} - Всего: - {{/usesnumber}} - {{#usesnumber}} - Всего: - {{/usesnumber}} - + + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/goodsreceipt.html b/www/templates/pages/doc/goodsreceipt.html index fc299b761..c91afeb6b 100644 --- a/www/templates/pages/doc/goodsreceipt.html +++ b/www/templates/pages/doc/goodsreceipt.html @@ -13,6 +13,7 @@

      Приходная накладная

      +
      @@ -23,6 +24,12 @@

      Приходная накладная

      + +
      + + +
      +
      @@ -35,19 +42,25 @@

      Приходная накладная

      +
      -
      - - -
      -
      - - -
      + +
      + + +
      + +
      + + +
      +
      Добавить новый
      - {{#usesnumber}} + {{#usesnumber}}
      - + - +
      -
      - +
      + - +
      {{/usesnumber}} diff --git a/www/templates/pages/doc/incomemoney.html b/www/templates/pages/doc/incomemoney.html new file mode 100644 index 000000000..37844f4e3 --- /dev/null +++ b/www/templates/pages/doc/incomemoney.html @@ -0,0 +1,58 @@ + + + + + + + +
      +

      Приходный ордер

      +
      +
      +
      + + +
      +
      + + +
      + +
      + + +
      +
      + + +
      +
      + + + + +
      + +
      +
      + +
      +
      + +   +   + +
      +
      + + +

      + +
      + + + + + + diff --git a/www/templates/pages/doc/moveitem.html b/www/templates/pages/doc/moveitem.html index ee2d5b42c..1bc6b006c 100644 --- a/www/templates/pages/doc/moveitem.html +++ b/www/templates/pages/doc/moveitem.html @@ -42,10 +42,10 @@

      Перемещение ТМЦ

      Название Ед. - {{#usesnumber}} + {{#usesnumber}} Серия Дата - {{/usesnumber}} + {{/usesnumber}} Кол. Цена @@ -53,10 +53,10 @@

      Перемещение ТМЦ

      - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} + {{/usesnumber}} diff --git a/www/templates/pages/doc/movemoney.html b/www/templates/pages/doc/movemoney.html new file mode 100644 index 000000000..b92070e70 --- /dev/null +++ b/www/templates/pages/doc/movemoney.html @@ -0,0 +1,62 @@ + + + + + + + +
      +

      Перемещение денежных средств

      +
      +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + +
      +
      + + + + +
      + +
      +
      + +
      +
      + +   +   + +
      +
      + + +

      + +
      + + + + + + diff --git a/www/templates/pages/doc/outcomemoney.html b/www/templates/pages/doc/outcomemoney.html new file mode 100644 index 000000000..2d293f0e7 --- /dev/null +++ b/www/templates/pages/doc/outcomemoney.html @@ -0,0 +1,58 @@ + + + + + + + +
      +

      Расходный ордер

      +
      +
      +
      + + +
      +
      + + +
      + +
      + + +
      +
      + + +
      +
      + + + + +
      + +
      +
      + +
      +
      + +   +   + +
      +
      + + +

      + +
      + + + + + + diff --git a/www/templates/pages/doc/prodissue.html b/www/templates/pages/doc/prodissue.html index 910e4610b..afb726ef7 100644 --- a/www/templates/pages/doc/prodissue.html +++ b/www/templates/pages/doc/prodissue.html @@ -16,7 +16,7 @@

      Списание на производство

      -
      +
      @@ -34,7 +34,7 @@

      Списание на производство

      - +
      @@ -58,8 +58,8 @@

      Списание на производство

      {{#usesnumber}} Серия Дата - {{/usesnumber}} - + {{/usesnumber}} + Кол. Цена @@ -72,10 +72,10 @@

      Списание на производство

      - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} + {{/usesnumber}} @@ -85,14 +85,14 @@

      Списание на производство

      - + {{^usesnumber}} - Всего: - {{/usesnumber}} - {{#usesnumber}} - Всего: - {{/usesnumber}} - + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/prodreceipt.html b/www/templates/pages/doc/prodreceipt.html index 5922b8cb4..62af9becb 100644 --- a/www/templates/pages/doc/prodreceipt.html +++ b/www/templates/pages/doc/prodreceipt.html @@ -18,7 +18,7 @@

      Оприходование с производства

      -
      +
      @@ -28,7 +28,7 @@

      Оприходование с производства

      - +
      - +
      -
      - +
      + - +
      {{/usesnumber}}
      @@ -156,7 +156,7 @@

      Ввод товара

      - +
      diff --git a/www/templates/pages/doc/retcustissue.html b/www/templates/pages/doc/retcustissue.html index 30518256c..6e995fa9f 100644 --- a/www/templates/pages/doc/retcustissue.html +++ b/www/templates/pages/doc/retcustissue.html @@ -47,10 +47,10 @@

      Возврат поставщику

      Название Код Ед. - {{#usesnumber}} + {{#usesnumber}} Серия Дата - {{/usesnumber}} + {{/usesnumber}} Кол. Цена @@ -62,10 +62,10 @@

      Возврат поставщику

      - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} + {{/usesnumber}} @@ -76,13 +76,13 @@

      Возврат поставщику

      - {{^usesnumber}} - Всего: - {{/usesnumber}} - {{#usesnumber}} - Всего: - {{/usesnumber}} - + {{^usesnumber}} + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/returnissue.html b/www/templates/pages/doc/returnissue.html index 86106ca32..2ef061d85 100644 --- a/www/templates/pages/doc/returnissue.html +++ b/www/templates/pages/doc/returnissue.html @@ -16,7 +16,13 @@

      Возвратная накладная

      +
      + + + + +

    @@ -30,12 +36,17 @@

    Возвратная накладная

    - + + + +
    +
    + + +
    -
    @@ -47,10 +58,10 @@

    Возвратная накладная

    Название Ед. - {{#usesnumber}} + {{#usesnumber}} Серия Дата - {{/usesnumber}} + {{/usesnumber}} Кол. @@ -62,10 +73,10 @@

    Возвратная накладная

    - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} + {{/usesnumber}} @@ -76,14 +87,14 @@

    Возвратная накладная

    - + {{^usesnumber}} - Всего: - {{/usesnumber}} - {{#usesnumber}} - Всего: - {{/usesnumber}} - + Всего: + {{/usesnumber}} + {{#usesnumber}} + Всего: + {{/usesnumber}} + diff --git a/www/templates/pages/doc/serviceact.html b/www/templates/pages/doc/serviceact.html index 63c3d37e2..b8a90a983 100644 --- a/www/templates/pages/doc/serviceact.html +++ b/www/templates/pages/doc/serviceact.html @@ -31,10 +31,17 @@

    Акт выполненых работ

    -
    - - -
    +
    + + +
    + +
    + + +
    diff --git a/www/templates/pages/doc/task.html b/www/templates/pages/doc/task.html index 67fbb5955..517dd43b4 100644 --- a/www/templates/pages/doc/task.html +++ b/www/templates/pages/doc/task.html @@ -53,7 +53,18 @@

    Наряд на выполнение работ

    -
    +
    +
    + + +
    + +
    + + +
    diff --git a/www/templates/pages/main.html b/www/templates/pages/main.html index 6ada107d7..2d4070317 100644 --- a/www/templates/pages/main.html +++ b/www/templates/pages/main.html @@ -4,17 +4,17 @@
    - +
    {{#usesnumber}} -
    +
    - {{/usesnumber}} - + {{/usesnumber}} +
    - +
    @@ -29,7 +29,7 @@
    - + diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html index 75c18e1b5..cd738b94c 100644 --- a/www/templates/pages/options.html +++ b/www/templates/pages/options.html @@ -18,6 +18,13 @@

    Основные настройки

    +
    + + + +
    @@ -97,7 +104,7 @@

    Настройка меню

    - + Добавить @@ -176,7 +183,7 @@
    Редактирование пункта меню
    - + \ No newline at end of file diff --git a/www/templates/pages/reference/customerlist.html b/www/templates/pages/reference/customerlist.html index 8a0127ef8..50aef06fa 100644 --- a/www/templates/pages/reference/customerlist.html +++ b/www/templates/pages/reference/customerlist.html @@ -6,7 +6,7 @@
    -

    Справочник контрагентов

    +

    Справочник контрагентов

    @@ -107,8 +107,8 @@

      Редактировать контрагента

    -
    -
    Расписание событий
    +
    +

    Расписание событий

    + @@ -80,7 +80,7 @@

    Журнал продаж


    @@ -145,8 +145,8 @@
    Расписание событий
    -
    -
    Коментарии
    +
    +

    Коментарии

    , : @@ -165,8 +165,8 @@
    Коментарии
    -
    -
    Прикрепленные файлы
    +
    +

    Прикрепленные файлы

    @@ -176,7 +176,7 @@
    Прикрепленные файлы
    - +
    diff --git a/www/templates/pages/reference/eqlist.html b/www/templates/pages/reference/eqlist.html index a2bf685b4..2df8fe111 100644 --- a/www/templates/pages/reference/eqlist.html +++ b/www/templates/pages/reference/eqlist.html @@ -102,28 +102,28 @@

    Редактирование

    - - - К списку -

    - -
    + + + К списку +

    + +
    - - + + - + - +
    Наряд Участок
    - +
    diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html index 150b19281..59087fa56 100644 --- a/www/templates/pages/reference/itemlist.html +++ b/www/templates/pages/reference/itemlist.html @@ -115,20 +115,20 @@

    Редактирование товара

    -
    +
    - {{#usesnumber}} -
    + {{#usesnumber}} +
    - {{/usesnumber}} + {{/usesnumber}}
    diff --git a/www/templates/pages/reference/mflist.html b/www/templates/pages/reference/mflist.html index 46e1ce00d..0f1ca09f0 100644 --- a/www/templates/pages/reference/mflist.html +++ b/www/templates/pages/reference/mflist.html @@ -22,7 +22,7 @@

    Денежные счета

    		- +
    diff --git a/www/templates/pages/register/doclist.html b/www/templates/pages/register/doclist.html index aefdb04cf..d69fef5ed 100644 --- a/www/templates/pages/register/doclist.html +++ b/www/templates/pages/register/doclist.html @@ -95,12 +95,12 @@

    Журнал документов

    -
    - - - - +
    + + + + diff --git a/www/templates/pages/register/gilist.html b/www/templates/pages/register/gilist.html index bffd40acd..352d00e55 100644 --- a/www/templates/pages/register/gilist.html +++ b/www/templates/pages/register/gilist.html @@ -49,7 +49,7 @@

    Журнал продаж

    -     		Примечание
    -
    +
    diff --git a/www/templates/pages/register/grlist.html b/www/templates/pages/register/grlist.html index 22ceaf36f..4d32e163d 100644 --- a/www/templates/pages/register/grlist.html +++ b/www/templates/pages/register/grlist.html @@ -48,7 +48,7 @@

    Журнал закупок

    - + Примечание @@ -79,8 +79,8 @@

    Журнал закупок

    -
    - +
    +
    @@ -92,7 +92,12 @@

    Журнал закупок

    + + + @@ -106,6 +111,7 @@

    Журнал закупок

       + diff --git a/www/templates/pages/register/ordercustlist.html b/www/templates/pages/register/ordercustlist.html index 24313477c..885352bd8 100644 --- a/www/templates/pages/register/ordercustlist.html +++ b/www/templates/pages/register/ordercustlist.html @@ -81,7 +81,7 @@

    Журнал заявок

    -
    +
    diff --git a/www/templates/pages/register/orderlist.html b/www/templates/pages/register/orderlist.html index 0c7583551..8aa7d3ac1 100644 --- a/www/templates/pages/register/orderlist.html +++ b/www/templates/pages/register/orderlist.html @@ -83,7 +83,7 @@

    Журнал заказов

    -
    +
    diff --git a/www/templates/pages/register/paylist.html b/www/templates/pages/register/paylist.html new file mode 100644 index 000000000..a01ea7aaa --- /dev/null +++ b/www/templates/pages/register/paylist.html @@ -0,0 +1,100 @@ + + +
    +
    + +

    Журнал платежей

    + + +
    + + + + + + + + + + + + + + + + + + + + + +
    +
    Скачать CSV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ДатаСчетПриход Расход НомерСоздалКонтрагентПримечание
    + + + +
    + +
    + + + +
    + +
    + +
    + +
    +
    +
    + + + + + + diff --git a/www/templates/pages/register/prodlist.html b/www/templates/pages/register/prodlist.html index 45b722f50..c87684d36 100644 --- a/www/templates/pages/register/prodlist.html +++ b/www/templates/pages/register/prodlist.html @@ -20,16 +20,16 @@

    Производство

    - + -
    Скачать CSV +
    Скачать CSV @@ -39,7 +39,7 @@

    Производство

    - + @@ -54,9 +54,9 @@

    Производство

    - - + +
    Участок Сумма @@ -72,19 +72,19 @@

    Производство

    - - - -
    + + + +
    + +
    - -
    -
    - + + diff --git a/www/templates/pages/register/stocklist.html b/www/templates/pages/register/stocklist.html index 46fcd7e54..84ddad355 100644 --- a/www/templates/pages/register/stocklist.html +++ b/www/templates/pages/register/stocklist.html @@ -11,65 +11,65 @@

    Товары на складе

    - + - + - + Скачать CSV - - - + + + - + - - + + - + - + - +
    НазваниеНазваниеАртикул Категория Ед.Кол.
    - + -
    - К списку -

    - +
    + К списку +

    +
    - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} + {{/usesnumber}} @@ -80,11 +80,11 @@

    - {{#usesnumber}} + {{#usesnumber}} - {{/usesnumber}} + {{/usesnumber}} @@ -93,7 +93,7 @@

    СкладСерия Дата серии Годен до Зак. цена Кол. На сумму
    -
    + diff --git a/www/templates/pages/report/itemactivity.html b/www/templates/pages/report/itemactivity.html index df8f15298..4cc5dddc2 100644 --- a/www/templates/pages/report/itemactivity.html +++ b/www/templates/pages/report/itemactivity.html @@ -20,7 +20,7 @@

    Движение по складу

    - + diff --git a/www/templates/pages/report/payactivity.html b/www/templates/pages/report/payactivity.html new file mode 100644 index 000000000..015fb6530 --- /dev/null +++ b/www/templates/pages/report/payactivity.html @@ -0,0 +1,47 @@ + + + + + +
    +
    +

    Движение по счетам

    +
    +
    + + + + + + + + + + + + + +
    +
    + + +
    +
    + + + + + + +
    + + + +
    +
    + +
    +
    +
    + + \ No newline at end of file diff --git a/www/templates/pages/report/prod.html b/www/templates/pages/report/prod.html index fb6d88b8a..ba6fe609f 100644 --- a/www/templates/pages/report/prod.html +++ b/www/templates/pages/report/prod.html @@ -15,12 +15,12 @@

    Отчет по производству

    - + - + diff --git a/www/templates/pages/userlogin.html b/www/templates/pages/userlogin.html index e828d9fef..9a8007b41 100644 --- a/www/templates/pages/userlogin.html +++ b/www/templates/pages/userlogin.html @@ -1,78 +1,78 @@ - - - - Zippy Склад - - - - - + + + + Zippy Склад + + + + + - - - - + + + + - - + + - + - - - + + + - + - + -
    +
    -
    +
    -
    -
    - -
    -
    - -
    + +
    + +
    +
    + +
    -
    +
    - - -
    -
    -
    +
    + -
    +
    -
    + +
    +
    +
    + v1.3.5 © zippy.com.ua +
    -
    -
    - v1.3.5 © zippy.com.ua -
    -
    diff --git a/www/templates/pages/users.html b/www/templates/pages/users.html index d46d5037b..b747b9006 100644 --- a/www/templates/pages/users.html +++ b/www/templates/pages/users.html @@ -79,12 +79,12 @@

    Редактирование пользователя

    - {{#usesnumber}} + {{#usesnumber}}
    - {{/usesnumber}} + {{/usesnumber}}
    @@ -93,23 +93,23 @@

    Редактирование пользователя

    - + {{#ocstore}} -
    +
    - {{/ocstore}} - + {{/ocstore}} + {{#shop}}
    - {{/shop}} - + {{/shop}} +
    diff --git a/www/templates/printforms/goodsissue.tpl b/www/templates/printforms/goodsissue.tpl index 31bbe6856..1a5f7db75 100644 --- a/www/templates/printforms/goodsissue.tpl +++ b/www/templates/printforms/goodsissue.tpl @@ -54,7 +54,7 @@ № Наименование Код - Ед. + Ед. Кол. Цена @@ -65,7 +65,7 @@ {{no}} {{tovar_name}} {{tovar_code}} - {{msr}} + {{msr}} {{quantity}} {{price}} diff --git a/www/templates/printforms/incomemoney.tpl b/www/templates/printforms/incomemoney.tpl new file mode 100644 index 000000000..00a0fa656 --- /dev/null +++ b/www/templates/printforms/incomemoney.tpl @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + +
    + Приходный ордер № {{document_number}} от {{date}}
    +
    + На счет: {{to}} +
    + Сумма: {{amount}} +
    + {{notes}} +
    + + diff --git a/www/templates/printforms/movemoney.tpl b/www/templates/printforms/movemoney.tpl new file mode 100644 index 000000000..836ee13f9 --- /dev/null +++ b/www/templates/printforms/movemoney.tpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + +
    + Перевод денежных средств № {{document_number}} от {{date}}
    +
    + Со счета: {{from}} +
    + На счет: {{to}} +
    + На сумму: {{amount}} +
    + + diff --git a/www/templates/printforms/order.tpl b/www/templates/printforms/order.tpl index ac07ce795..2eb8584ef 100644 --- a/www/templates/printforms/order.tpl +++ b/www/templates/printforms/order.tpl @@ -1,6 +1,6 @@ - + diff --git a/www/templates/printforms/outcomemoney.tpl b/www/templates/printforms/outcomemoney.tpl new file mode 100644 index 000000000..37b12bdaf --- /dev/null +++ b/www/templates/printforms/outcomemoney.tpl @@ -0,0 +1,31 @@ + +
    + + + + + + + + + + + + + + + + + + +
    + Расходный ордер № {{document_number}} от {{date}}
    +
    + Со счета: {{from}} +
    + Сумма: {{amount}} +
    + {{notes}} +
    + + diff --git a/www/templates/printforms/payactivity.tpl b/www/templates/printforms/payactivity.tpl new file mode 100644 index 000000000..f09c132f7 --- /dev/null +++ b/www/templates/printforms/payactivity.tpl @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + {{#_detail}} + + + + + + + + + + + + {{/_detail}} + + + + + + + + + + + + +
    + Движение по денежным счетам +
    + Период с {{datefrom}} по {{dateto}}     Счет: {{mf_name}} +
    ДатаНач.Прих.Расх.Кон.Документы
    {{date}}{{in}}{{obin}}{{obout}}{{out}} {{{documents}}}
    Итого:{{tb}}{{tin}}{{tout}}{{tend}}
    + + diff --git a/www/templates/printforms/prod.tpl b/www/templates/printforms/prod.tpl index cf68e921a..fb9da6e13 100644 --- a/www/templates/printforms/prod.tpl +++ b/www/templates/printforms/prod.tpl @@ -3,7 +3,7 @@ -

    Отчет по производству

    +

    Отчет по производству

    @@ -16,14 +16,14 @@ - Производственный участок {{parea}}
    + Производственный участок {{parea}}
    {{/parea}} -
    Списано на производство
    +
    Списано на производство
    @@ -63,7 +63,7 @@
    -
    Оприходовано с производства
    +
    Оприходовано с производства
    diff --git a/www/templates/printforms/prodissue.tpl b/www/templates/printforms/prodissue.tpl index bdac2a24a..ded7193f9 100644 --- a/www/templates/printforms/prodissue.tpl +++ b/www/templates/printforms/prodissue.tpl @@ -1,23 +1,23 @@ - + diff --git a/www/templates/printforms/prodreceipt.tpl b/www/templates/printforms/prodreceipt.tpl index 18b2cd41c..f4cdf6bf0 100644 --- a/www/templates/printforms/prodreceipt.tpl +++ b/www/templates/printforms/prodreceipt.tpl @@ -1,22 +1,22 @@
    - Списание на производство № {{document_number}} от {{date}}
    + Списание на производство № {{document_number}} от {{date}}
    - Производственный участок {{pareaname}}
    + Производственный участок {{pareaname}}
    - {{notes}}
    + {{notes}}
    - + diff --git a/www/templates/printforms/returnissue.tpl b/www/templates/printforms/returnissue.tpl index fa823953b..ceb28dd71 100644 --- a/www/templates/printforms/returnissue.tpl +++ b/www/templates/printforms/returnissue.tpl @@ -1,6 +1,6 @@
    - Оприходование с производства № {{document_number}} от {{date}}
    + Оприходование с производства № {{document_number}} от {{date}}
    - Производственный участок {{pareaname}}
    + Производственный участок {{pareaname}}
    - {{notes}}
    + {{notes}}
    - + diff --git a/www/templates/printforms/serviceact.tpl b/www/templates/printforms/serviceact.tpl index fa4a3fa81..b7d7b272b 100644 --- a/www/templates/printforms/serviceact.tpl +++ b/www/templates/printforms/serviceact.tpl @@ -4,15 +4,15 @@ - - + + - + - - + + @@ -48,7 +48,7 @@ - diff --git a/www/templates/printforms/serviceorder.tpl b/www/templates/printforms/serviceorder.tpl index 88f203b79..5917af76e 100644 --- a/www/templates/printforms/serviceorder.tpl +++ b/www/templates/printforms/serviceorder.tpl @@ -4,8 +4,8 @@ - - + + - +
    Заказчик: {{customer}}
    Заказ: {{order}}
    {{total}}

    +
    Гарантия: {{gar}}
    Заказчик: {{customer}}
    @@ -37,7 +37,7 @@ Всего: {{total}}
    diff --git a/www/templates/printforms/task.tpl b/www/templates/printforms/task.tpl index ca8da9c0c..7aac07f9b 100644 --- a/www/templates/printforms/task.tpl +++ b/www/templates/printforms/task.tpl @@ -16,7 +16,7 @@ Произв. участок: - {{pareaname}} + {{pareaname}} @@ -28,7 +28,7 @@ Наряд № {{document_number}} с {{startdate}} по {{date}} - +
    diff --git a/www/templates/printforms/transitem.tpl b/www/templates/printforms/transitem.tpl index 4a5d58bbf..aea418bb1 100644 --- a/www/templates/printforms/transitem.tpl +++ b/www/templates/printforms/transitem.tpl @@ -9,8 +9,8 @@ - @@ -19,7 +19,7 @@ Входной ТМЦ: @@ -27,7 +27,7 @@ Выходной ТМЦ: @@ -35,14 +35,14 @@ Сумма: - - + +
    Склад: - {{from}} + + {{from}}
    - {{fromitemname}} + {{fromitemname}}
    - {{toitemname}} + {{toitemname}}
    - {{amount}} + {{amount}}
    diff --git a/www/templates/widgets/docview.html b/www/templates/widgets/docview.html index f13648a2c..20b7302cf 100644 --- a/www/templates/widgets/docview.html +++ b/www/templates/widgets/docview.html @@ -2,160 +2,167 @@ -
    - - - - -
    -
    -  Экспорт: - - - - - - -
    -
    -
    +
    -
    -
    - - - - + +
    +  
    Присоединенные файлы
    +
    - - - - + + +
    +
    +  Экспорт: + + + + + + +
    +
    + +
    +
    + +
    + +
    + +
    , : -
    -
    + + + + + +
    + + + + + +
    , : +
    +
    +
    + +
    + +
    + +
    +
    + + +
    +
    + +
    +  
    Присоединенные документы
    + + + +
    -
    - +
    + + +
    - -
    - + +
    + + -
    + + + + +
    +
    +
    + + +
    + +
    + +
    + +
    + +
    - - +
    -
    -
    -
    - -
    -  
    Присоединенные документы
    - - - - - -
    -
    -
    - - -
    - -
    - - -
    -
    -  
    Присоединенные файлы
    - - - - - -
    -
    -
    - - -
    - -
    - -
    - -
    - - -
    -
    +
    +
    -
    -
    -
    +
    +
    История изменений статусов
    + + + + + + + + + + + + -
    -
    История изменений статусов
    -
    СтатусДатаАвторХост
    - - - - - + +
    СтатусДатаАвторХост
    +
    +
    +
    История оплат
    + + + + + + + + + - - - - - - + + + + + + + + - -
    ДатаСчетПриходРасходАвторКоментарий
    -
    -
    -
    История оплат
    - - - - - - - - - - - - - - - -
    ДатаСуммаАвторКоментарий
    + + +
    -
    +
    -
    -
    +
    +