Преглед изворни кода

punkt 7 dodaj kontrahenta naprawiony

michalzmijewski пре 7 година
родитељ
комит
a10df0fb4c
2 измењених фајлова са 41 додато и 41 уклоњено
  1. 36 39
      tools/Bocian.php
  2. 5 2
      tools/Bocian.php.view.js

+ 36 - 39
tools/Bocian.php

@@ -264,54 +264,51 @@ TODO: dodać możliwość wysyłania maila używajac mail()
 		 Response::sendTryCatchJson(array($this, 'createKontrahentAjax'), $args = 'JSON_FROM_REQUEST_BODY'); // użyj tej wersji jeśli chcesz wysyłać z przelgądarki JSON-a post-em
 	}
 	public function createKontrahentAjax($args) {
-		$companyFullName = V::post('companyFullName', '', $args);
-		$companyShortName = V::post('$companyShortName', '', $args);
-		$companyNameGroup = V::post('companyNameGroup', '', $args);
-		$companyKrs = V::post('companyKrs', '', $args);
-		$companyNip = V::post('companyNip', '', $args);
-		$companyPesel = V::post('companyPesel', '', $args);
-		$companyFax = V::post('companyFax', '', $args);
-		$companyTelefon = V::post('companyTelefon', '', $args);
-		$companyMail = V::post('companyMail', '', $args);
-		$companyStreet = V::post('companyStreet', '', $args);
-		$companyNumberBuilding = V::post('companyNumberBuilding', '', $args);
-		$companyNumberLocal = V::post('companyNumberLocal', '', $args);
-		$companyPostCode = V::post('companyPostCode', '', $args);
-		$companyPlace = V::post('companyPlace', '', $args);
-		$companyCountry = V::post('companyCountry', '', $args);
-		$companyTypeCompany = V::post('companyTypeCompany', '', $args);
-		$companyTitleDocument = V::post('companyTitleDocument', '', $args);
-		$companyDesc = V::post('companyDesc', '', $args);
+		$companyFullName = V::get('companyFullName', '', $args);
+		$companyShortName = V::get('$companyShortName', '', $args);
+		$companyNameGroup = V::get('companyNameGroup', '', $args);
+		$companyKrs = V::get('companyKrs', '', $args);
+		$companyNip = V::get('companyNip', '', $args);
+		$companyPesel = V::get('companyPesel', '', $args);
+		$companyFax = V::get('companyFax', '', $args);
+		$companyTelefon = V::get('companyTelefon', '', $args);
+		$companyMail = V::get('companyMail', '', $args);
+		$companyStreet = V::get('companyStreet', '', $args);
+		$companyNumberBuilding = V::get('companyNumberBuilding', '', $args);
+		$companyNumberLocal = V::get('companyNumberLocal', '', $args);
+		$companyPostCode = V::get('companyPostCode', '', $args);
+		$companyPlace = V::get('companyPlace', '', $args);
+		$companyCountry = V::get('companyCountry', '', $args);
+		$companyTypeCompany = V::get('companyTypeCompany', '', $args);
+		$companyTitleDocument = V::get('companyTitleDocument', '', $args);
+		$companyDesc = V::get('companyDesc', '', $args);
 
 		// validate
-		if (!$imiona) throw new Exception("Nie wpisano imienia");
-		if (!$nazwisko) throw new Exception("Nie wpisano  nazwiska");
+		if (!$companyFullName) throw new Exception("Nie wpisano pełnej nazwy kontrahenta");
 
 
 		$idKontrahent = DB::getPDO()->insert('BI_audit_ENERGA_RUM_KONTRAHENCI', [
 			'Pelna_nazwa_kontrahenta' => $companyFullName,
-			'Skrocona_Nazwa_Kontrahenta' => $companyShortName,
-			'Nazwa_grupy_kapitalowej' => $companyNameGroup,
-			'KRS' => $companyKrs,
-			'NIP' => $companyNip,
-			'PESEL' => $companyPesel,
-			'Fax' => $companyFax,
-			'Telefon' => $companyTelefon,
-			'Mail' => $companyMail,
-			'Ulica' => $companyStreet,
-			'Numer_budynku' => $companyNumberBuilding,
-			'Numer_mieszkania_lokalu' => $companyNumberLocal,
-			'Kod_pocztowy' => $companyPostCode,
-			'Miejscowosc' => $companyPlace,
-			'Kraj' => $companyCountry,
-			'Typ_kontrahenta' => $companyTypeCompany,
-			'Tytul_dokumentu' => $companyTitleDocument,
-			'uwagi' => $companyDesc,
+			'Skrocona_Nazwa_Kontrahenta' => ($companyShortName) ? $companyShortName : null,
+			'Nazwa_grupy_kapitalowej' => ($companyNameGroup) ? $companyNameGroup : null,
+			'KRS' => ($companyKrs) ? $companyKrs : null,
+			'NIP' => ($companyNip) ? $companyNip : null,
+			'PESEL' => ($companyPesel) ? $companyPesel : null,
+			'Fax' => ($companyFax) ? $companyFax : null,
+			'Telefon' => ($companyTelefon) ? $companyTelefon : null,
+			'Mail' => ($companyMail) ? $companyMail : null,
+			'Ulica' => ($companyStreet) ? $companyStreet : null,
+			'Numer_budynku' => ($companyNumberBuilding) ? $companyNumberBuilding : null,
+			'Numer_mieszkania_lokalu' => ($companyNumberLocal) ? $companyNumberLocal : null,
+			'Kod_pocztowy' => ($companyPostCode) ? $companyPostCode : null,
+			'Miejscowosc' => ($companyPlace) ? $companyPlace : null,
+			'Kraj' => ($companyCountry) ? $companyCountry : null,
+			'Typ_kontrahenta' => ($companyTypeCompany) ? $companyTypeCompany : null,
+			'Tytul_dokumentu' => ($companyTitleDocument) ? $companyTitleDocument : null,
+			'uwagi' => ($companyDesc) ? $companyDesc  : null,
 
 			'A_RECORD_CREATE_AUTHOR' => User::getLogin(),
 			'A_RECORD_CREATE_DATE' => 'NOW()',
-			'NAZWA' => $nazwa,
-			'ID_USER' => User::getID()
 		]);
 
 		return [

+ 5 - 2
tools/Bocian.php.view.js

@@ -602,9 +602,12 @@ function createKontrahentAjax(event) {
 
 
 				//validate data from input
-				if (!companyFullName) reject('Proszę podać imię');
+				if (!companyFullName){
+					reject('Proszę podać pełną nazwę');
+					return;
+				}
 
-				window.fetch(URL_CREATE_PRACOWNICY, {
+				window.fetch(URL_CREATE_KONTRAHENCI, {
 					method: 'POST',
 					header: {
 						'contentType': 'applications/json'