From 4abf1297fe402d08bfe6b9168b0b0321897574d2 Mon Sep 17 00:00:00 2001
From: Robert <robert@smalc.si>
Date: Fri, 27 Nov 2020 14:20:39 +0100
Subject: [PATCH] =?UTF-8?q?Drupal:=20Polje=20dr=C5=BEava=20je=20obvezno=20?=
 =?UTF-8?q?za=20vse,=20dinami=C4=8Dno=20preverjanje,=20=C4=8De=20je=20zave?=
 =?UTF-8?q?zanec=20za=20DDV.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sites/all/themes/pro1ka/js/script.js      |  42 +++-
 .../nakupovanje-1ka-kosarica.tpl.php          | 179 +++++++++---------
 2 files changed, 128 insertions(+), 93 deletions(-)

diff --git a/frontend/drupal/sites/all/themes/pro1ka/js/script.js b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
index e8cfe58fc..43df4a37e 100755
--- a/frontend/drupal/sites/all/themes/pro1ka/js/script.js
+++ b/frontend/drupal/sites/all/themes/pro1ka/js/script.js
@@ -622,6 +622,7 @@
         // Naročila
         jQuery('.racun-na-podjetje').on('click', function () {
           jQuery('.podatki-za-podjetje').toggle();
+          prikaziPoljeEracun();
 
           if (jQuery('#racun-na-podjetje').is(':checked')) {
             jQuery('.polje-za-podjetje').attr('required', 'required');
@@ -678,6 +679,19 @@
             return '';
           }
 
+          //Pridobi API klic, če gre za davčnega zavezanca
+          jQuery.post('/frontend/api/api.php?action=check_ddv', {
+            cena: jQuery('#predogled-nakupa-1ka .cena-paketa').text(),
+            podjetje_drzava: jQuery('[name="podjetje_drzava"] :selected').val(),
+            podjetje_davcna: jQuery('[name="podjetje_davcna"]').val()
+          }).done(function (val) {
+            val = JSON.parse(val);
+
+            if (val.success && val.cena > 0) {
+              jQuery('#predogled-nakupa-1ka .cena-paketa').text(val.cena);
+            }
+          });
+
           // Pri trajanju je pomembno,da pravilno sklanjamo
           var trajanje = jQuery('[name="trajanje"]:checked').val();
           if (trajanje == 12) {
@@ -697,6 +711,7 @@
             jQuery('#forma-telefon').text(jQuery('#f-telefon').val());
             jQuery('#col-forma-telefon').show();
           }
+          jQuery('#forma-d-drzava').text(jQuery('[name="podjetje_drzava"] :selected').val());
 
           // Iz forme poberemo pdoatke o podjetju
           if (jQuery('#racun-na-podjetje').is(':checked')) {
@@ -705,7 +720,6 @@
             jQuery('#forma-d-naslov').text(jQuery('[name="podjetje_naslov"]').val());
             jQuery('#forma-d-postna-st').text(jQuery('[name="podjetje_postna"]').val());
             jQuery('#forma-d-posta-ime').text(jQuery('[name="podjetje_posta"]').val());
-            jQuery('#forma-d-drzava').text(jQuery('[name="podjetje_drzava"] :selected').val());
           }
 
           var placilo = "";
@@ -901,12 +915,7 @@
         });
 
         jQuery('#nakup-1ka #polje-drzava').on('change', function(){
-          if(jQuery(this).val() == 'Slovenija' || jQuery(this).val() == 'Slovenia'){
-            jQuery('#nakup-1ka #polje-podjetje-eracun').show();
-          } else {
-            jQuery('#nakup-1ka #polje-podjetje-eracun').hide();
-            jQuery('[name="podjetje_eracun"]').prop('checked', false);
-          }
+          prikaziPoljeEracun();
         });
 
         jQuery('[name="podjetje_davcna"]').keyup(function () {
@@ -1355,3 +1364,22 @@ function posodobiCenoPaketa() {
 function lang() {
   return jQuery('[name="lang"]').val();
 }
+
+/**
+ * Prikažemo polje za Slovenijo v kolikor je uporabnik proračunski uporabnik
+ */
+function prikaziPoljeEracun(){
+
+  if(jQuery('#racun-na-podjetje').is(':checked') &&
+    (jQuery('#nakup-1ka #polje-drzava').val() == 'Slovenija' || jQuery('#nakup-1ka #polje-drzava').val() == 'Slovenia')){
+
+    jQuery('#nakup-1ka #polje-podjetje-eracun').show();
+
+  } else {
+
+    jQuery('#nakup-1ka #polje-podjetje-eracun').hide();
+    jQuery('[name="podjetje_eracun"]').prop('checked', false);
+
+  }
+
+}
diff --git a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
index 292ab4b79..13fad0324 100644
--- a/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
+++ b/frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
@@ -184,85 +184,10 @@
             </div>
           </div>
 
-          <div class="w-clearfix">
-            <div class="col _3-3-3-12">
-              <div class="checkbox-field w-checkbox racun-na-podjetje">
-                <input type="checkbox" name="podjetje" value="1" class="cb w-checkbox-input" id="racun-na-podjetje">
-                <span class="checkbox-display"></span>
-                <span>
-                  <label for="racun-na-podjetje" class="checkbox-label w-form-label racun-na-podjetje">
-                    <?php if ($language->language == 'sl'): ?>
-                      Želim račun na podjetje
-                    <?php else: ?>
-                      I would like an invoice to the company
-                    <?php endif; ?>
-                  </label>
-                </span>
-              </div>
-            </div>
-          </div>
+          <?php
+          $slovenija = ($language->language == 'sl' ? 'Slovenija' : 'Slovenia');
 
-          <div class="podatki-za-podjetje">
-            <div class="w-clearfix">
-              <div class="col _3-3-3-12">
-                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_davcna" value=""
-                       size="30"
-                       placeholder="<?php echo($language->language == 'sl' ? 'Vnestite ID za DDV podjetja (obvezno)' : 'Enter your business VAT ID (required)'); ?>">
-              </div>
-            </div>
-
-<!--            <div class="w-clearfix">-->
-<!--              <div class="col _3-3-3-12">-->
-<!--                <div class="checkbox-field w-checkbox polje-za-podjetje">-->
-<!--                  <input type="checkbox" name="podjetje_ddv" value="1" class="cb w-checkbox-input" id="zavezanec-za-ddv">-->
-<!--                  <span class="checkbox-display checkbox-zavezanec-za-ddv"></span>-->
-<!--                  <span>-->
-<!--                    <label for="zavezanec-za-ddv" class="checkbox-label w-form-label">-->
-<!--                      --><?php //if ($language->language == 'sl'): ?>
-<!--                        Zavezanec za DDV-->
-<!--                      --><?php //else: ?>
-<!--                        VAT-registered user-->
-<!--                      --><?php //endif; ?>
-<!--                    </label>-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </div>-->
-
-            <div class="w-clearfix">
-              <div class="col _3-3-3-12">
-                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_ime" value="" size="30"
-                       placeholder="<?php echo($language->language == 'sl' ? 'Vnestite ime / naziv podjetja (obvezno)' : 'Enter the company name (required)'); ?>">
-              </div>
-            </div>
-
-            <div class="w-clearfix">
-              <div class="col _3-3-3-12">
-                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_naslov" value=""
-                       size="30"
-                       placeholder="<?php echo($language->language == 'sl' ? 'Vnestite naslov podjetja (obvezno)' : 'Enter the business address (required)'); ?>">
-              </div>
-            </div>
-
-            <div class="w-clearfix">
-              <div class="col _3-3-3-12">
-                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_postna" value=""
-                       size="30"
-                       placeholder="<?php echo($language->language == 'sl' ? 'Poštna številka (obvezno)' : 'Postcode (required)'); ?>">
-              </div>
-            </div>
-
-            <div class="w-clearfix">
-              <div class="col _3-3-3-12">
-                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_posta" value=""
-                       size="30" placeholder="<?php echo($language->language == 'sl' ? 'Ime pošte (obvezno)' : 'Post name (required)'); ?>">
-              </div>
-            </div>
-
-            <?php
-            $slovenija = ($language->language == 'sl' ? 'Slovenija' : 'Slovenia');
-
-            $country_list = array(
+          $country_list = array(
             "Afghanistan",
             "Albania",
             "Algeria",
@@ -456,18 +381,92 @@
             "Yemen",
             "Zambia",
             "Zimbabwe"
-            );?>
+          );?>
+          <div class="w-clearfix">
+            <div class="col _3-3-3-12">
+              <select name="podjetje_drzava" class="input-field w-input" id="polje-drzava" required="required">
+                <option value="" disabled="disabled" <?php printf ($language->language != 'sl' ? 'selected="selected"' : ''); ?>> - <?php printf ($language->language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> -</option>
+                <?php foreach($country_list as  $country): ?>
+                  <option value="<?php  printf($country); ?>" <?php printf ($language->language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?>><?php printf($country); ?></option>
+                <?php endforeach; ?>
+              </select>
+            </div>
+          </div>
+
+          <div class="w-clearfix">
+            <div class="col _3-3-3-12">
+              <div class="checkbox-field w-checkbox racun-na-podjetje">
+                <input type="checkbox" name="podjetje" value="1" class="cb w-checkbox-input" id="racun-na-podjetje">
+                <span class="checkbox-display"></span>
+                <span>
+                  <label for="racun-na-podjetje" class="checkbox-label w-form-label racun-na-podjetje">
+                    <?php if ($language->language == 'sl'): ?>
+                      Želim račun na podjetje
+                    <?php else: ?>
+                      I would like an invoice to the company
+                    <?php endif; ?>
+                  </label>
+                </span>
+              </div>
+            </div>
+          </div>
+
+          <div class="podatki-za-podjetje">
             <div class="w-clearfix">
               <div class="col _3-3-3-12">
-                <select name="podjetje_drzava" class="input-field w-input polje-za-podjetje" id="polje-drzava">
-                    <option value="" disabled="disabled" <?php printf ($language->language != 'sl' ? 'selected="selected"' : ''); ?>> - <?php printf ($language->language == 'sl' ? 'Izberite državo' : 'Select a country'); ?> -</option>
-                  <?php foreach($country_list as  $country): ?>
-                    <option value="<?php  printf($country); ?>" <?php printf ($language->language == 'sl' && $country == 'Slovenija' ? 'selected="selected"' : ''); ?>><?php printf($country); ?></option>
-                  <?php endforeach; ?>
-                </select>
+                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_davcna" value=""
+                       size="30"
+                       placeholder="<?php echo($language->language == 'sl' ? 'Vnestite ID za DDV podjetja (obvezno)' : 'Enter your business VAT ID (required)'); ?>">
               </div>
             </div>
 
+<!--            <div class="w-clearfix">-->
+<!--              <div class="col _3-3-3-12">-->
+<!--                <div class="checkbox-field w-checkbox polje-za-podjetje">-->
+<!--                  <input type="checkbox" name="podjetje_ddv" value="1" class="cb w-checkbox-input" id="zavezanec-za-ddv">-->
+<!--                  <span class="checkbox-display checkbox-zavezanec-za-ddv"></span>-->
+<!--                  <span>-->
+<!--                    <label for="zavezanec-za-ddv" class="checkbox-label w-form-label">-->
+<!--                      --><?php //if ($language->language == 'sl'): ?>
+<!--                        Zavezanec za DDV-->
+<!--                      --><?php //else: ?>
+<!--                        VAT-registered user-->
+<!--                      --><?php //endif; ?>
+<!--                    </label>-->
+<!--                  </span>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+
+            <div class="w-clearfix">
+              <div class="col _3-3-3-12">
+                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_ime" value="" size="30"
+                       placeholder="<?php echo($language->language == 'sl' ? 'Vnestite ime / naziv podjetja (obvezno)' : 'Enter the company name (required)'); ?>">
+              </div>
+            </div>
+
+            <div class="w-clearfix">
+              <div class="col _3-3-3-12">
+                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_naslov" value=""
+                       size="30"
+                       placeholder="<?php echo($language->language == 'sl' ? 'Vnestite naslov podjetja (obvezno)' : 'Enter the business address (required)'); ?>">
+              </div>
+            </div>
+
+            <div class="w-clearfix">
+              <div class="col _3-3-3-12">
+                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_postna" value=""
+                       size="30"
+                       placeholder="<?php echo($language->language == 'sl' ? 'Poštna številka (obvezno)' : 'Postcode (required)'); ?>">
+              </div>
+            </div>
+
+            <div class="w-clearfix">
+              <div class="col _3-3-3-12">
+                <input type="text" class="input-field w-input polje-za-podjetje" name="podjetje_posta" value=""
+                       size="30" placeholder="<?php echo($language->language == 'sl' ? 'Ime pošte (obvezno)' : 'Post name (required)'); ?>">
+              </div>
+            </div>
 
               <div class="w-clearfix">
                 <div class="col _3-3-3-12">
@@ -630,6 +629,14 @@
         <?php endif; ?>
         <span id="forma-telefon">/</span>
       </div>
+      <div class="col" id="col-forma-d-drzava">
+        <?php if ($language->language == 'sl'): ?>
+          Država:
+        <?php else: ?>
+          Country:
+        <?php endif; ?>
+        <span id="forma-d-drzava">/</span>
+      </div>
 
       <!--        Račun na podjetje -->
       <div class="podatki-za-podjetje">
@@ -665,7 +672,7 @@
             Address:
           <?php endif; ?>
           <span id="forma-d-naslov"></span>, <span id="forma-d-postna-st"></span> <span
-            id="forma-d-posta-ime"></span>, <span id="forma-d-drzava"></span>
+            id="forma-d-posta-ime"></span>
         </div>
       </div>