| @@ -37,6 +37,15 @@ class UploadedFileController extends ArlistaAbstractController { | |||
| // Data extraction from file | |||
| $result = $this->getSpreadSheetFactory()->extractDataFromSpreadSheet($spreadSheet, $sheetSettings); | |||
| // Munkalapok száma eltér a konfigurált munkalapok számától | |||
| if (isset($result['validation'])) { | |||
| $this->getResponseBody()->setMessage($result['validation']); | |||
| $this->getResponse()->setData($this->getResponseBody()->toArray()); | |||
| return $this->getResponse(); | |||
| } | |||
| // Munkalapok neve eltér a konfigurált munkalapok nevétől | |||
| foreach($sheetSettings as $sheetSetting){ | |||
| if (isset($result['extracted'][$sheetSetting->getIndex()]['validation'])) { | |||
| $this->getResponseBody()->setMessage($result['extracted'][$sheetSetting->getIndex()]['validation']); | |||
| @@ -80,6 +80,12 @@ class SpreadSheetFactory extends AbstractSpreadSheetFactory { | |||
| return $result; | |||
| } | |||
| if($worksheetCount > count($sheetSettings)){ | |||
| $result['validation'] = ['A munkalapok száma nem felel meg az konfigurált munkalapok számának.']; | |||
| return $result; | |||
| } | |||
| $result['spreadSheet'] = $spreadSheet; | |||
| @@ -402,7 +408,7 @@ class SpreadSheetFactory extends AbstractSpreadSheetFactory { | |||
| // * FABRIC NAME | |||
| 'D' => $product->getFabricName(), | |||
| // * VTSZ | |||
| 'F' => $product->getVtsz(), | |||
| 'F' => '', | |||
| // * AXICO ID | |||
| 'G' => $product->getAxicoId(), | |||
| // * AXICO NAME | |||
| @@ -118,8 +118,8 @@ class ArlistaSetupForm extends ConfigFormBase { | |||
| $form['default_vtsz_szam'] = [ | |||
| '#title' => 'Alapértelmezett VTSZ érték', | |||
| '#type' => 'textfield', | |||
| '#required' => true, | |||
| '#default_value' => $config->get('default_vtsz_szam') ? $config->get('default_vtsz_szam') : '0' | |||
| '#required' => false, | |||
| '#default_value' => $config->get('default_vtsz_szam') ? $config->get('default_vtsz_szam') : '' | |||
| ]; | |||
| $form = parent::buildForm($form, $form_state); | |||
| @@ -187,11 +187,11 @@ class ProductAdd extends ArlistaAbstractForm { | |||
| ]; | |||
| $form['items_wrapper']['vtsz'] = [ | |||
| '#title' => 'Vámtarifaszám', | |||
| '#required' => true, | |||
| '#required' => false, | |||
| '#max' => 32, | |||
| '#type' => 'textfield', | |||
| '#weight' => 120, | |||
| '#default_value' => $this->getConfig()->get('default_vtsz_szam') ? $this->getConfig()->get('default_vtsz_szam') : '0' | |||
| '#default_value' => $this->getConfig()->get('default_vtsz_szam') ? $this->getConfig()->get('default_vtsz_szam') : '' | |||
| ]; | |||
| $form['items_wrapper']['eol'] = [ | |||
| '#title' => 'EOL', | |||
| @@ -287,7 +287,7 @@ class ProductUploadedEdit extends ArlistaAbstractForm { | |||
| '#required' => false, | |||
| '#max' => 32, | |||
| '#type' => 'textfield', | |||
| '#default_value' => $product->getVtsz() ? $product->getVtsz() : ($this->getConfig()->get('default_vtsz_szam') ? $this->getConfig()->get('default_vtsz_szam') : '0'), | |||
| '#default_value' => $product->getVtsz() ? $product->getVtsz() : ($this->getConfig()->get('default_vtsz_szam') ? $this->getConfig()->get('default_vtsz_szam') : ''), | |||
| '#weight' => -730, | |||
| ]; | |||
| $form['eol'] = [ | |||