03-03-2017 Meeting Amendments

assets/global/scripts/components-date-time-pickers.js

@@ -0,0 +1,249 @@
+var ComponentsDateTimePickers = function () {
+
+    var handleDatePickers = function () {
+
+        if (jQuery().datepicker) {
+            $('.date-picker').datepicker({
+                rtl: App.isRTL(),
+                orientation: "left",
+                autoclose: true
+            });
+            //$('body').removeClass("modal-open"); // fix bug when inline picker is used in modal
+        }
+
+        /* Workaround to restrict daterange past date select: http://stackoverflow.com/questions/11933173/how-to-restrict-the-selectable-date-ranges-in-bootstrap-datepicker */
+    
+        // Workaround to fix datepicker position on window scroll
+        $( document ).scroll(function(){
+            $('#form_modal2 .date-picker').datepicker('place'); //#modal is the id of the modal
+        });
+    }
+
+    var handleTimePickers = function () {
+
+        if (jQuery().timepicker) {
+            $('.timepicker-default').timepicker({
+                autoclose: true,
+                showSeconds: true,
+                minuteStep: 1
+            });
+
+            $('.timepicker-no-seconds').timepicker({
+                autoclose: true,
+                minuteStep: 5,
+                defaultTime: false
+            });
+
+            $('.timepicker-24').timepicker({
+                autoclose: true,
+                minuteStep: 5,
+                showSeconds: false,
+                showMeridian: false
+            });
+
+            // handle input group button click
+            $('.timepicker').parent('.input-group').on('click', '.input-group-btn', function(e){
+                e.preventDefault();
+                $(this).parent('.input-group').find('.timepicker').timepicker('showWidget');
+            });
+
+            // Workaround to fix timepicker position on window scroll
+            $( document ).scroll(function(){
+                $('#form_modal4 .timepicker-default, #form_modal4 .timepicker-no-seconds, #form_modal4 .timepicker-24').timepicker('place'); //#modal is the id of the modal
+            });
+        }
+    }
+
+    var handleDateRangePickers = function () {
+        if (!jQuery().daterangepicker) {
+            return;
+        }
+
+        $('#defaultrange').daterangepicker({
+                opens: (App.isRTL() ? 'left' : 'right'),
+                format: 'MM/DD/YYYY',
+                separator: ' to ',
+                startDate: moment().subtract('days', 29),
+                endDate: moment(),
+                ranges: {
+                    'Today': [moment(), moment()],
+                    'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)],
+                    'Last 7 Days': [moment().subtract('days', 6), moment()],
+                    'Last 30 Days': [moment().subtract('days', 29), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')]
+                },
+                minDate: '01/01/2012',
+                maxDate: '12/31/2018',
+            },
+            function (start, end) {
+                $('#defaultrange input').val(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
+            }
+        );        
+
+        $('#defaultrange_modal').daterangepicker({
+                opens: (App.isRTL() ? 'left' : 'right'),
+                format: 'MM/DD/YYYY',
+                separator: ' to ',
+                startDate: moment().subtract('days', 29),
+                endDate: moment(),
+                minDate: '01/01/2012',
+                maxDate: '12/31/2018',
+            },
+            function (start, end) {
+                $('#defaultrange_modal input').val(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
+            }
+        );  
+
+        // this is very important fix when daterangepicker is used in modal. in modal when daterange picker is opened and mouse clicked anywhere bootstrap modal removes the modal-open class from the body element.
+        // so the below code will fix this issue.
+        $('#defaultrange_modal').on('click', function(){
+            if ($('#daterangepicker_modal').is(":visible") && $('body').hasClass("modal-open") == false) {
+                $('body').addClass("modal-open");
+            }
+        });
+
+        $('#reportrange').daterangepicker({
+                opens: (App.isRTL() ? 'left' : 'right'),
+                startDate: moment().subtract('days', 29),
+                endDate: moment(),
+                //minDate: '01/01/2012',
+                //maxDate: '12/31/2014',
+                dateLimit: {
+                    days: 60
+                },
+                showDropdowns: true,
+                showWeekNumbers: true,
+                timePicker: false,
+                timePickerIncrement: 1,
+                timePicker12Hour: true,
+                ranges: {
+                    'Today': [moment(), moment()],
+                    'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)],
+                    'Last 7 Days': [moment().subtract('days', 6), moment()],
+                    'Last 30 Days': [moment().subtract('days', 29), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')]
+                },
+                buttonClasses: ['btn'],
+                applyClass: 'green',
+                cancelClass: 'default',
+                format: 'MM/DD/YYYY',
+                separator: ' to ',
+                locale: {
+                    applyLabel: 'Apply',
+                    fromLabel: 'From',
+                    toLabel: 'To',
+                    customRangeLabel: 'Custom Range',
+                    daysOfWeek: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
+                    monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+                    firstDay: 1
+                }
+            },
+            function (start, end) {
+                $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
+            }
+        );
+        //Set the initial state of the picker label
+        $('#reportrange span').html(moment().subtract('days', 29).format('MMMM D, YYYY') + ' - ' + moment().format('MMMM D, YYYY'));
+    }
+
+    var handleDatetimePicker = function () {
+
+        if (!jQuery().datetimepicker) {
+            return;
+        }
+
+        $(".form_datetime").datetimepicker({
+            autoclose: true,
+            isRTL: App.isRTL(),
+            format: "yyyy-mm-dd hh:ii",
+            fontAwesome: true,
+            pickerPosition: (App.isRTL() ? "bottom-right" : "bottom-left")
+        });
+
+        $(".form_advance_datetime").datetimepicker({
+            isRTL: App.isRTL(),
+            format: "dd MM yyyy - hh:ii",
+            autoclose: true,
+            todayBtn: true,
+            fontAwesome: true,
+            startDate: "2013-02-14 10:00",
+            pickerPosition: (App.isRTL() ? "bottom-right" : "bottom-left"),
+            minuteStep: 10
+        });
+
+        $(".form_meridian_datetime").datetimepicker({
+            isRTL: App.isRTL(),
+            format: "dd MM yyyy - HH:ii P",
+            showMeridian: true,
+            autoclose: true,
+            fontAwesome: true,
+            pickerPosition: (App.isRTL() ? "bottom-right" : "bottom-left"),
+            todayBtn: true
+        });
+
+        $('body').removeClass("modal-open"); // fix bug when inline picker is used in modal
+
+        // Workaround to fix datetimepicker position on window scroll
+        $( document ).scroll(function(){
+            $('#form_modal1 .form_datetime, #form_modal1 .form_advance_datetime, #form_modal1 .form_meridian_datetime').datetimepicker('place'); //#modal is the id of the modal
+        });
+    }
+
+    var handleClockfaceTimePickers = function () {
+
+        if (!jQuery().clockface) {
+            return;
+        }
+
+        $('.clockface_1').clockface();
+
+        $('#clockface_2').clockface({
+            format: 'HH:mm',
+            trigger: 'manual'
+        });
+
+        $('#clockface_2_toggle').click(function (e) {
+            e.stopPropagation();
+            $('#clockface_2').clockface('toggle');
+        });
+
+        $('#clockface_2_modal').clockface({
+            format: 'HH:mm',
+            trigger: 'manual'
+        });
+
+        $('#clockface_2_modal_toggle').click(function (e) {
+            e.stopPropagation();
+            $('#clockface_2_modal').clockface('toggle');
+        });
+
+        $('.clockface_3').clockface({
+            format: 'H:mm'
+        }).clockface('show', '14:30');
+
+        // Workaround to fix clockface position on window scroll
+        $( document ).scroll(function(){
+            $('#form_modal5 .clockface_1, #form_modal5 #clockface_2_modal').clockface('place'); //#modal is the id of the modal
+        });
+    }
+
+    return {
+        //main function to initiate the module
+        init: function () {
+            handleDatePickers();
+            handleTimePickers();
+            handleDatetimePicker();
+            handleDateRangePickers();
+            handleClockfaceTimePickers();
+        }
+    };
+
+}();
+
+if (App.isAngularJsApp() === false) { 
+    jQuery(document).ready(function() {    
+        ComponentsDateTimePickers.init(); 
+    });
+}

assets/modul-js/arrangements/warehouse-arrangement/create.js

@@ -1,4 +1,12 @@
 $('#decision_request').find('.submit').show();
+function toggleCheckbox(element)
+{
+	if(element.checked == true){
+		$('#decision_request_title').text("Unmatched Quantity & Damaged");
+	}else{
+		$('#decision_request_title').text("Unmatched Quantity");
+	}
+}
 var FormWizard = function () {
 
 
@@ -9,22 +17,7 @@ var FormWizard = function () {
                 return;
             }
 
-            function format(state) {
-                if (!state.id) return state.text; // optgroup
-                return "<img class='flag' src='../../assets/global/img/flags/" + state.id.toLowerCase() + ".png'/>&nbsp;&nbsp;" + state.text;
-            }
-
-            $("#country_list").select2({
-                placeholder: "Select",
-                allowClear: true,
-                formatResult: format,
-                width: 'auto', 
-                formatSelection: format,
-                escapeMarkup: function (m) {
-                    return m;
-                }
-            });
-
+            
             var form = $('#submit_form');
             var error = $('.alert-danger', form);
             var success = $('.alert-success', form);
@@ -183,6 +176,7 @@ var FormWizard = function () {
             });
 
             $('#form_wizard_1').find('.button-previous').hide();
+            
             $('#form_wizard_1 .button-submit').click(function () {
 					var dataString = $('#submit_form').serialize() + '&submit_type=no_decision_request';
 					$.ajax({

assets/modul-js/common/dashboard/dashboard.so.js

@@ -6,7 +6,7 @@
 		"type": "POST",
 	  },
 	"columnDefs": [
-    { className: "dt-body-center", "targets": [ 0,1,2,3,4,5,6,7,8,9,10,11 ] },
+    { className: "dt-body-center", "targets": [ 0,1,2,3,4,5,6,7,8,9,10 ] },
     
   ],
 	"language": {

assets/modul-js/common/dashboard/dashboard.so.min.js

@@ -6,7 +6,7 @@
 		"type": "POST",
 	  },
 	"columnDefs": [
-    { className: "dt-body-center", "targets": [ 0,1,2,3,4,5,6,7,8,9,10,11 ] },
+    { className: "dt-body-center", "targets": [ 0,1,2,3,4,5,6,7,8,9,10 ] },
     
   ],
 	"language": {

assets/modul-js/common/messenger/order.min.js

@@ -33,7 +33,7 @@ jQuery(document).ready(function() {
 		
 	});
     $(document).on("click", "#form-decision-request .decision-yes", function() {
-		var message_id = $('.warehouse-arrangement').data('message_id');
+		var message_id = $(this).data('message_id');
 		var decision = "1";
 		var dataStringg = 'decision=' + decision + '&message_id=' + message_id;
 		$.ajax({
@@ -47,23 +47,9 @@ jQuery(document).ready(function() {
         });
 	 
 	});
-    $(document).on("click", "#form-delivery-request .decision-yes", function() {
-		var message_id = $('.warehouse-arrangement').data('message_id');
-		var decision = "1";
-		var dataStringg = 'decision=' + decision + '&message_id=' + message_id;
-		$.ajax({
-            type: "POST",
-            url: "/messenger/order/decision-request-update",
-            cache: false,
-            data: dataStringg,
-            success: function(data) {
-                location.reload();
-            }
-        });
-	 
-	});
-    $(document).on("click", ".decision-no", function() {
-		var message_id = $('.warehouse-arrangement').data('message_id');
+    
+    $(document).on("click", "form-decision-request .decision-no", function() {
+		var message_id = $(this).data('message_id');
 		var decision = "2";
 		var dataStringg = 'decision=' + decision + '&message_id=' + message_id;
 		$.ajax({
@@ -77,11 +63,52 @@ jQuery(document).ready(function() {
         });
 	 
 	});
+
+	$(document).on("click", "#form-delivery-request .decision-yes", function() {
+		var message_id = $(this).data('message_id');
+		var decision = "1";
+		var id = $(this).data('id');
+		var dataStringg = 'decision=' + decision + '&message_id=' + message_id + '&id=' + id;
+		$.ajax({
+            type: "POST",
+            url: "/messenger/order/decision-request-update",
+            cache: false,
+            data: dataStringg,
+            success: function(data) {
+                location.reload();
+            }
+        });
+	 
+	});
+    $(document).on("click", "#form-delivery-request .decision-no", function() {
+		jQuery("#delivery-request-details").modal('hide');
+		jQuery("#form_decision_reject").modal('show');	 
+	});
+    $(document).on("click", "#decision_reject .submit", function() {
+		var message_id = $(this).data('message_id');
+		var id = $(this).data('id');
+		var decision = "2";
+		var reason = $('#decision_reject').data('id');
+		var dataStringg = $('#decision_reject').serialize() + '&decision=' + decision + '&message_id=' + message_id + '&id=' + id;
+		$.ajax({
+            type: "POST",
+            url: "/messenger/order/decision-request-update",
+            cache: false,
+            data: dataStringg,
+            success: function(data) {
+                location.reload();
+            }
+        }); 
+	});
     $(document).on("click", ".decision-request-details", function() {
 		var group_id = $('#chats').data('group_id');
 		var decision = $(this).data('decision');
 		var id = $(this).data('id');
 		var message_id = $(this).data('message_id');
+		$('#form-decision-request .decision-no').attr('data-id', id);
+		$('#form-decision-request .decision-no').attr('data-message_id', message_id);
+		$('#form-decision-request .decision-yes').attr('data-id', id);
+		$('#form-decision-request .decision-yes').attr('data-message_id', message_id);
 		if(group_id == 1){
 			if(decision == 1){
 			$('#decision-request-action').html("Your importer have agree to <span class='font-green-meadow bold'>accept</span> this decision request");
@@ -113,8 +140,15 @@ jQuery(document).ready(function() {
 		var decision = $(this).data('decision');
 		var id = $(this).data('id');
 		var message_id = $(this).data('message_id');
+		$('#decision_reject .submit').attr('data-id', id);
+		$('#decision_reject .submit').attr('data-message_id', message_id);
+		$('#form-delivery-request .decision-no').attr('data-id', id);
+		$('#form-delivery-request .decision-no').attr('data-message_id', message_id);
+		$('#form-delivery-request .decision-yes').attr('data-id', id);
+		$('#form-delivery-request .decision-yes').attr('data-message_id', message_id);
 		if(group_id == 1){
 			if(decision == 1){
+			
 			$('#delivery-request-action').html("Your importer have agree to <span class='font-green-meadow bold'>accept</span> this decision request");
 			}else if(decision == 2){
 				$('#delivery-request-action').html("Your importer have agree to <span class='font-red bold'>decline</span> this decision request");

assets/modul-js/orders/shipping-order/create.min.js

@@ -98,8 +98,7 @@ var TableDatatablesEditable = function() {
                 $('.button-previous2').trigger('click');
                 
 				$('#finish2').remove();
-                $('.button-next2').after('&nbsp;<a class="btn green button-submit2" id="finish2" style="display: inline-block;"> Finish!</a>'); //add input box
-                $('#finish2').hide();
+                $('#form-actions').after('&nbsp;<a class="btn green button-submit2" id="finish2" style="display: inline-block;"> Finish!</a>'); //add input box
                 $('#rowNo').remove();
                 $('#form_add').modal('hide');
 
@@ -386,9 +385,8 @@ var TableDatatablesEditable = function() {
                 $('#form_wizard_2').append('<div id="rowNo"><input type="text" style="display:none;" name="rowNumber" id="rowNumber" value="' + nRow.index() + '"/></div>'); //add input box
 
                 $('#finish2').remove();
-                $('.button-next2').after('&nbsp;<a class="btn green button-edit2" id="finish2" style="display: inline-block;"> Finish!</a>'); //add input box
-                $('#finish2').hide();
-
+                $('#form-actions').after('&nbsp;<a class="btn green button-edit2" id="finish2" style="display: block;"> Finish!</a>'); //add input box
+				
                 $('#form_add').modal('show');
             });