added Zaliczka.delivery_date_notes

SE/se-lib/Route/UrlAction/ProjektyProNetMediaZamZlec.php

@@ -164,6 +164,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 						, o.`OFFER_NR`
 						, o.`ORDER_TYPE`
 						, o.`DELIVERY_DATE`
+						, o.`DELIVERY_DATE_NOTES`
 						, o.`EXECUTION_START_DATE`
 						, o.`EXECUTION_END_DATE`
 						, o.`CASH_PENALTY`
@@ -221,6 +222,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 		$sqlFieldsList[] = 'COMPANY_CONTACT_TEL';
 		$sqlFieldsList[] = 'COMPANY_CONTACT_MAIL';
 		$sqlFieldsList[] = 'DELIVERY_DATE';
+		$sqlFieldsList[] = 'DELIVERY_DATE_NOTES';
 		$sqlFieldsList[] = 'DELIVERY_TYPE';
 		$sqlFieldsList[] = 'DELIVERY_LOCATION';
 		$sqlFieldsList[] = 'CASH_PENALTY';
@@ -338,6 +340,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 		$sqlFieldsList[] = 'COMPANY_CONTACT_TEL';
 		$sqlFieldsList[] = 'COMPANY_CONTACT_MAIL';
 		$sqlFieldsList[] = 'DELIVERY_DATE';
+		$sqlFieldsList[] = 'DELIVERY_DATE_NOTES';
 		$sqlFieldsList[] = 'DELIVERY_TYPE';
 		$sqlFieldsList[] = 'DELIVERY_LOCATION';
 		$sqlFieldsList[] = 'CASH_PENALTY';
@@ -500,6 +503,13 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 				$data['COMPANY_CONTACT_TEL'] = V::get('COMPANY_CONTACT_TEL', '', $row);
 				$data['COMPANY_CONTACT_MAIL'] = V::get('COMPANY_CONTACT_MAIL', '', $row);
 				$data['DELIVERY_DATE'] = V::get('DELIVERY_DATE', '', $row);
+				if (!empty($data['DELIVERY_DATE'])) {
+					$data['DELIVERY_DATE'] = (strlen($data['DELIVERY_DATE']) < 10) ? '' : substr($data['DELIVERY_DATE'], 0, 10);
+					$dateEx = explode('-', $data['DELIVERY_DATE']);
+					if (count($dateEx) != 3) $data['DELIVERY_DATE'] = '';
+					else if (strlen($dateEx[0]) != 4 || strlen($dateEx[1]) != 2) $data['DELIVERY_DATE'] = '';
+				}
+				$data['DELIVERY_DATE_NOTES'] = V::get('DELIVERY_DATE_NOTES', '', $row);
 				$data['DELIVERY_START_DATE'] = V::get('DELIVERY_START_DATE', '', $row);
 				$data['DELIVERY_TYPE'] = V::get('DELIVERY_TYPE', '', $row);
 				$data['DELIVERY_LOCATION'] = V::get('DELIVERY_LOCATION', '', $row);
@@ -1021,6 +1031,7 @@ body { font-size:12px; line-height:1.3em }
 			$sqlFieldsList[] = 'COMPANY_CONTACT_TEL';
 			$sqlFieldsList[] = 'COMPANY_CONTACT_MAIL';
 			$sqlFieldsList[] = 'DELIVERY_DATE';
+			$sqlFieldsList[] = 'DELIVERY_DATE_NOTES';
 			$sqlFieldsList[] = 'DELIVERY_TYPE';
 			$sqlFieldsList[] = 'DELIVERY_LOCATION';
 			$sqlFieldsList[] = 'CASH_PENALTY';
@@ -1267,6 +1278,8 @@ body { font-size:12px; line-height:1.3em }
 				['field', '', 'DELIVERY_START_DATE', 'string'],
 				['text', ' do dnia '],
 				['field', '', 'DELIVERY_DATE', 'date'],
+				['text', ' '],
+				['field', '', 'DELIVERY_DATE_NOTES', 'text'],
 				['text', ' , po tym terminie będzie naliczana przez Zleceniodawcę kara umowna odpowiednio za opóźnienie Zleceniobiorcy w rozpoczęciu / zakończeniu przedmiotu zlecenia w wysokości '],
 				['field', '', 'CASH_PENALTY', 'string'],
 				// "……….. złotych (słownie: …………. złotych 00/100)
@@ -1353,6 +1366,8 @@ body { font-size:12px; line-height:1.3em }
 			$conditions[] = [
 				['bold', 'Termin wykonania usługi: '],
 				['field', '', 'DELIVERY_DATE', 'date'],
+				['text', ' '],
+				['field', '', 'DELIVERY_DATE_NOTES', 'text'],
 				['text', ', po tym terminie Zamawiający zastrzega sobie prawo do odmowy odbioru przedmiotu zamówienia.']
 			];
 			$conditions[] = [
@@ -1836,5 +1851,13 @@ ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS_HIST` ADD `ORDER_CONTACT_EMAIL` varchar(64
 -- ADD `ADDITIONAL_CONDITIONS` - visible in orders list
 ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS`      ADD `ADDITIONAL_CONDITIONS` varchar(1000)     NOT NULL DEFAULT '';
 ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS_HIST` ADD `ADDITIONAL_CONDITIONS` varchar(1000) NOT NULL DEFAULT 'N/S;';
+-- ADD `DELIVERY_DATE_NOTES` - visible in orders list
+ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS`      ADD `DELIVERY_DATE_NOTES` varchar(255)     NOT NULL DEFAULT '';
+ALTER TABLE `CRM_LISTA_ZASOBOW_ORDERS_HIST` ADD `DELIVERY_DATE_NOTES` varchar(255) NOT NULL DEFAULT 'N/S;';
+
+-- update
+update `CRM_LISTA_ZASOBOW_ORDERS` set `DELIVERY_DATE_NOTES` = `DELIVERY_DATE`;
+update `CRM_LISTA_ZASOBOW_ORDERS` set `DELIVERY_DATE` = '';
+
 
 */