mz/crm.e5.pl
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

delivery date in sale fix

Browse Source
This commit is contained in:
Michał Zieliński
2025-08-30 13:20:14 +02:00
parent 9a8acbe6a9
commit fb866fb386
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/EcmSales/javascript/EcmSales6.js
View File

@@ -27,7 +27,7 @@ $(document).ready(
}); });
$("#delivery_date").on('inputchange', function() { $("#delivery_date").on('inputchange', function() {
calculateDate($("#delivery_date").val()); calculateDate($("#delivery_date").val());
}); });
if ($("#type").val() == 'interval_order') { if ($("#type").val() == 'interval_order') {
addToValidate('EditView', 'sale_date_interval', 'id', 'true', addToValidate('EditView', 'sale_date_interval', 'id', 'true',
@@ -109,7 +109,7 @@ $(document).ready(
SetTab('ITEMS'); SetTab('ITEMS');
} }
}; };
calculateDate($("#delivery_date").val());
}); });
// handle save // handle save
var check_form_ = check_form; var check_form_ = check_form;

17
modules/EcmSales/javascript/helper.php
View File

@@ -20,11 +20,18 @@ switch ($_POST['job']) {
} }
function calculateDate($date){ function calculateDate($date){
$date = new Datetime($date); $date = new Datetime($date);
$date->modify('-1 day'); $date->modify('-1 day');
$tmp['date']=$date->format("d.m.Y"); $tmp['date']=$date->format("d.m.Y");
echo json_encode($tmp); $tmp['date_day']=date('N', strtotime($tmp['date']));
return ''; if($tmp['date_day']==7){
$date->modify('-2 day');
} else if($tmp['date_day']==6){
$date->modify('-1 day');
}
$tmp['date']=$date->format("d.m.Y");
echo json_encode($tmp);
return '';
} }
function validateDate($date,$date2){ function validateDate($date,$date2){
$date = new Datetime($date); $date = new Datetime($date);