0.0.34 forms

static/v2/js/forms/f_make_poster_order.js

@@ -61,15 +61,18 @@ function updateCargoTypeInForm(el, type_transport='') {
         let cargo_types = res.cargo_types
         if (!cargo_types) return;
 
-        resetWRadioInputs('cargo_type');
         let $widget = getWRadioInputsWidget('cargo_type');
+        let $selected_value = $widget.querySelector(".radio.checked")
+        resetWRadioInputs('cargo_type');
         for (let cargo_type of cargo_types) {
             let obj = {
                 name: cargo_type[0],
                 title: cargo_type[1],
             }
+            let selected = false;
+            if ($selected_value && $selected_value.closest(".cw_w_radio_inputs_radio_input").dataset.name === obj.name) selected = true;
 
-            let html = generateRadioInput(obj)
+            let html = generateRadioInput(obj, selected)
 
             if ($widget.lastElementChild){
                 $(html).insertAfter($($widget.lastElementChild))

static/v2/js/widgets/w_daterangepicker.js

@@ -35,15 +35,19 @@ function datarangepickerinitAll(){
     })
 }
 
-function daterangepickerInit(el, callback) {
+function daterangepickerInit(el, callback, date) {
     let $datarangepicker = el.querySelector('input')
+    let min_date = moment()
+    if (date){
+        min_date = moment(date);
+    }
     $($datarangepicker).daterangepicker({
         "autoapply": true,
         "linkedCalendars": false,
         "singleDatePicker": true,
         "timePicker": false,
         "timePicker24Hour": false,
-        "minDate": moment(),
+        "minDate": moment(date),
         "locale": setLocalSets(),
     }, function (start, end, label) {
         let $parent = el.closest('.w_daterangepicker')

static/v2/js/widgets/w_radio_inputs.js

@@ -19,10 +19,10 @@ function chooseRadioInput(el, callback){
     if (callback) callback(el, el_name)
 }
 
-function generateRadioInput(data){
+function generateRadioInput(data, selected){
     let html = `
         <div class="cw_w_radio_inputs_radio_input" data-name="${data.name}">
-            <div class="radio" onclick="chooseRadioInput(this, ${data.callback})"></div>
+            <div class="radio${selected? ' checked' : ''}" onclick="chooseRadioInput(this, ${data.callback})"></div>
             <div class="radio_label" onclick="chooseRadioInput(this, ${data.callback})">${data.title}</div>
         </div>
     `

static/v2/js/widgets/w_select_country.js

@@ -87,6 +87,7 @@ function selectCountry(el, callback) {
         id: el.dataset.id,
         country_code: el.dataset.country_code,
         flag: el.dataset.flag,
+        now: el.dataset.now
     }
 
     $flag.src = country_data.flag;
@@ -96,10 +97,21 @@ function selectCountry(el, callback) {
     $input.dataset.name = country_data.full_name;
     $input.dataset.id = country_data.id;
 
+    connectCountryWDateRangePicker(el, country_data)
     closeSelectCountry(el);
     resetFieldError(el);
 }
 
+function connectCountryWDateRangePicker (el, data) {
+    let $parent = el.closest(".field_container")
+    if (!$parent || !data || typeof daterangepickerInit === 'undefined') return;
+
+    let datepicker_name = $parent.dataset.datepicker;
+
+    let $datepicker = $(`.field_container[data-name="${datepicker_name}"]`)[0]
+    daterangepickerInit($datepicker, false, data.now)
+}
+
 function resetCountrySelect(el, callback) {
     let $parent = el.closest('.w_select_country');
     if (!$parent) return;