Prechádzať zdrojové kódy

fixed ORDER_DATE in ZamZlec for pro-netmedia

Piotr Labudda 9 rokov pred
rodič
commit
e417e6710e

+ 5 - 3
SE/se-lib/Route/UrlAction/ProjektyProNetMediaZamZlec.php

@@ -241,6 +241,8 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 
 				$data['ORDER_TYPE'] = V::get('ORDER_TYPE', '', $row);
 				$data['ORDER_LABEL'] = V::get('ORDER_LABEL', '', $row);
+				$defaultOrderDate = substr(V::get('A_RECORD_CREATE_DATE', date("Y-m-d"), $row), 0, 10);
+				$data['ORDER_DATE'] = V::get('ORDER_DATE', $defaultOrderDate, $row);
 				$data['OFFER_NR'] = V::get('OFFER_NR', '', $row);
 				$data['COMPANY_NAME'] = V::get('COMPANY_NAME', '', $row);
 				$data['COMPANY_ADDRESS'] = V::get('COMPANY_ADDRESS', '', $row);
@@ -640,6 +642,7 @@ body { font-size:12px; line-height:1.3em }
 			$sqlFieldsList[] = 'ORDER_APPROVE_PERSON';
 			$sqlFieldsList[] = 'DELIVERY_CONTACT_PERSON';
 			$sqlFieldsList[] = 'OFFER_NR';
+			$sqlFieldsList[] = 'ORDER_DATE';
 			$sqlFieldsList[] = 'PAYMENT_TERM_DAYS_FV';
 			$sqlFieldsList[] = 'PAYMENT_METHOD';
 
@@ -880,10 +883,9 @@ body { font-size:12px; line-height:1.3em }
 </div>
 
 <script src="stuff/vendors.js"></script>
-<script src="stuff/bundle.se_route_orders.js?_ver=92358c68"></script>
+<script src="stuff/bundle.se_route_orders.js?_ver=722cae68"></script>
 <script>
 var _mode = '<?php echo $mode; ?>';
-var _projectInfo = {id: 5130};// TODO: ID PROJECT - use only fields?
 var _notes = 'NA FAKTURZE VAT NALEŻY UMIESZCZAĆ CZYTELNY NR ZAMÓWIENIA';
 var _pos = <?php echo json_encode($orderPosList); ?>;
 var _saveLink = '<?php echo $saveLink; ?>';
@@ -983,6 +985,7 @@ jQuery("#widget-orders").p5_Orders({
     deal: {
       nr: 'ORDER_LABEL',
       offerNr: 'OFFER_NR',
+			date: 'ORDER_DATE',
 			targetName: '_nr_budowy'// TODO: nazwa budowy?
     },
     comB: {
@@ -1015,7 +1018,6 @@ jQuery("#widget-orders").p5_Orders({
 	backLink: 'index.php?_route=UrlAction_ProjektyProNetMediaZamZlec&ID_PROJECT=<?php echo $id_project; ?>',
 	printLink: 'index.php?_route=UrlAction_ProjektyProNetMediaZamZlec&_task=zamowienie&_print=1',
   printIdOrderArg: 'id',
-	projectInfo: _projectInfo,
 	pos: _pos,
   notes: _notes,
   mode: _mode,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
SE/stuff/bundle.se_route_orders.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov