|
|
@@ -133,6 +133,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
|
|
|
$sqlFieldsList[] = 'ORDER_APPROVE_PERSON';
|
|
|
$sqlFieldsList[] = 'DELIVERY_CONTACT_PERSON';
|
|
|
$sqlFieldsList[] = 'PAYMENT_TERM_DAYS_FV';
|
|
|
+ $sqlFieldsList[] = 'PAYMENT_METHOD';
|
|
|
$sqlObj = array();
|
|
|
$sqlObj['ORDER_TYPE'] = $orderType;
|
|
|
foreach ($data as $fldName => $val) {
|
|
|
@@ -244,6 +245,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
|
|
|
$data['ORDER_APPROVE_PERSON'] = V::get('ORDER_APPROVE_PERSON', '', $row);
|
|
|
$data['DELIVERY_CONTACT_PERSON'] = V::get('DELIVERY_CONTACT_PERSON', '', $row);
|
|
|
$data['PAYMENT_TERM_DAYS_FV'] = V::get('PAYMENT_TERM_DAYS_FV', '60', $row);
|
|
|
+ $data['PAYMENT_METHOD'] = V::get('PAYMENT_METHOD', 'przelew', $row);
|
|
|
}
|
|
|
|
|
|
$data['orderPosList'] = $this->fetchOrderPosList($sqlIdOrder);
|
|
|
@@ -619,6 +621,7 @@ body { font-size:12px; line-height:1.3em }
|
|
|
$sqlFieldsList[] = 'DELIVERY_CONTACT_PERSON';
|
|
|
$sqlFieldsList[] = 'OFFER_NR';
|
|
|
$sqlFieldsList[] = 'PAYMENT_TERM_DAYS_FV';
|
|
|
+ $sqlFieldsList[] = 'PAYMENT_METHOD';
|
|
|
|
|
|
$sqlObj = array();
|
|
|
//$sqlObj['ORDER_TYPE'] = $json['type'];
|
|
|
@@ -857,7 +860,7 @@ body { font-size:12px; line-height:1.3em }
|
|
|
</div>
|
|
|
|
|
|
<script src="stuff/vendors.js"></script>
|
|
|
-<script src="stuff/bundle.se_route_orders.js?_ver=2e908792"></script>
|
|
|
+<script src="stuff/bundle.se_route_orders.js?_ver=92358c68"></script>
|
|
|
<script>
|
|
|
var _mode = '<?php echo $mode; ?>';
|
|
|
var _projectInfo = {id: 5130};// TODO: ID PROJECT - use only fields?
|
|
|
@@ -882,13 +885,14 @@ _conditions.push([
|
|
|
]);
|
|
|
_conditions.push([
|
|
|
['bold', 'Warunki płatności: '],
|
|
|
- ['text', 'przelew '],
|
|
|
+ ['field_readonly', 'przelew', 'PAYMENT_METHOD'],
|
|
|
+ ['text', ' '],
|
|
|
['field', '', 'PAYMENT_TERM_DAYS_FV', 'int'],
|
|
|
['text', ' dni po dostawie towaru']
|
|
|
]);
|
|
|
_conditions.push([
|
|
|
['bold', 'Forma płatności: '],
|
|
|
- ['text', 'przelew']
|
|
|
+ ['field', 'przelew', 'PAYMENT_METHOD', 'string']
|
|
|
]);
|
|
|
_conditions.push([
|
|
|
['bold', 'Termin płatności: '],
|
|
|
@@ -1230,6 +1234,9 @@ ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS` ADD `APPROVE_STATUS` enum('WERSJA_ROBOCZA
|
|
|
-- ADD payment term days after fv
|
|
|
ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS_HIST` ADD `PAYMENT_TERM_DAYS_FV` VARCHAR(11) NOT NULL DEFAULT 'N/S;';
|
|
|
ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS` ADD `PAYMENT_TERM_DAYS_FV` int(11) NOT NULL DEFAULT '0';
|
|
|
+-- ADD payment method
|
|
|
+ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS_HIST` ADD `PAYMENT_METHOD` VARCHAR(32) NOT NULL DEFAULT 'N/S;';
|
|
|
+ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS` ADD `PAYMENT_METHOD` VARCHAR(32) NOT NULL DEFAULT '';
|
|
|
|
|
|
|
|
|
1213 12 14/AS/13/SP/2014/IV/2016 14 / AS / 13/SP/2014 / IV / 2016
|
