cief/ARCHIVED-IZYIM
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/ARCHIVED-IZYIM.git synced 2026-08-28 08:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

03-03-2017 Meeting Amendments

Browse Source
This commit is contained in:
CIEF Dev Team
2018-03-06 21:43:24 +00:00
parent 4716562987
commit b90f620ea6
33 changed files with 941 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/global/scripts/components-date-time-pickers.js
Executable
+249
View File
@@ -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/layouts/layout/img/logo-big-white.png → assets/layouts/layout/img/font
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

assets/modul-js/arrangements/warehouse-arrangement/create.js
+10 -16
View File
@@ -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
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+52 -18
View File
@@ -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
Vendored
+3 -5
View File
@@ -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');
});
includes/core.php
+2 -2
View File
@@ -9,8 +9,8 @@ use Symfony\Component\HttpKernel\Debug\ExceptionHandler;
// ENABLE ERROR WARNING / DEBUG
//ini_set("display_errors", "0");
//error_reporting(-1);
ini_set("display_errors", "0");
error_reporting(-1);
date_default_timezone_set("Asia/Kuala_Lumpur");
ini_set( 'date.timezone', 'Asia/Kuala_Lumpur' );
includes/func.class/general.func.php
+45 -7
View File
@@ -25,13 +25,7 @@ function delete_directory($dirname) {
rmdir($dirname);
return true;
}
function getStatusCompanyFriend($company_id){
global $db;
$db->bind('company_id', $company_id);
$groups = $db->query("SELECT * FROM company_friend WHERE status = 0 and company_id = :company_id ");
return count($groups);
}
function getStatusFriendCompany($company_id){
global $db;
$db->bind('company_id', $company_id);
@@ -670,6 +664,50 @@ function get_warehouse($warehouse_id, $kolom) {
return "0";
}
}
function getStatusCompanyFriend($company_id){
global $db;
$db->bind('company_id', $company_id);
$groups = $db->query("SELECT * FROM company_friend WHERE status = 0 and company_id = :company_id ");
return count($groups);
}
function getRoomUnread($room_id){
global $db;
$db->bind("room_id", $room_id);
$db->bind("user_id", $_SESSION['user_id']);
$row = $db->query("SELECT * FROM notice_unread WHERE room_id = :room_id and user_id = :user_id and status = 0;");
return (count($row) > 0 ? count($row) : "");
}
function getOrderUnread(){
global $db;
$db->bind("user_id", $_SESSION['user_id']);
$row = $db->query("SELECT * FROM notice_unread join notice_rooms on notice_unread.room_id = notice_rooms.room_id WHERE notice_unread.user_id = :user_id and notice_unread.status = 0 and notice_rooms.order_id IS NOT null");
return (count($row) > 0 ? count($row) : "");
}
function getSOUnread(){
global $db;
$db->bind("user_id", $_SESSION['user_id']);
$row = $db->query("SELECT * FROM shipping_order_unread WHERE status = 0 and user_id = :user_id");
return (count($row) > 0 ? count($row) : "");
}
function getContactUnread(){
global $db;
$db->bind("user_id", $_SESSION['user_id']);
$row = $db->query("SELECT * FROM user_friend WHERE status = 0 and user_id = :user_id");
return (count($row) > 0 ? count($row) : "");
}
function getGeneralUnread() {
global $db;
$db->bind("user_id", $_SESSION['user_id']);
includes/func.class/logs/2018-03-06.txt
-67
View File
@@ -1,67 +0,0 @@
Time : 18:46:37
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:43:29
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:41:32
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:40:52
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:37:53
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:32:52
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:29:31
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:25:51
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:25:08
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'user_id' at row 1
Raw SQL : INSERT INTO login_log(user_id,date,ip_address,status) VALUES(:user_id,CURRENT_TIMESTAMP,:ip,:status)
Time : 18:20:59
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:20:57
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:19:05
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:16:50
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:15:15
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:11:14
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:10:58
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
Time : 18:09:49
SQLSTATE[HY000]: General error: 1366 Incorrect integer value: 'undefined' for column 'reply_id' at row 1
Raw SQL : INSERT INTO notice_messages(message,chat_type,from_id,reply_id) VALUES (:message,:chat_type,:from_id,:reply_id)
includes/tpl/footer.php
+5
View File
@@ -67,12 +67,17 @@
var obj = JSON.parse( data );
var unread_order = obj[0].unread_order;
var unread_contact = obj[0].unread_contact;
var unread_so = obj[0].unread_so;
if(unread_order != ""){
$('a[href$="/messenger/general"]').find('span.title').html('Messenger<span class="badge badge-danger pull-right">'+unread_order+'</span>');
}
if(unread_contact != ""){
$('a[href$="/contacts"]').find('span.title').html('Contact List<span class="badge badge-danger pull-right">'+unread_contact+'</span>');
}
if(unread_so != ""){
$('a[href$="/shipping-order"]').find('span.title').html('Shipping Order<span class="badge badge-danger pull-right">'+unread_so+'</span>');
$('span:contains("Orders")').html('Orders<span class="badge badge-danger" style="margin-left: 40px;">'+unread_so+'</span>');
}
}
});
modul/arrangements/delivery/delivery.func.php
+10
View File
@@ -40,4 +40,14 @@
return (count($delivery_arrangements) > 0 ? $delivery_arrangements[0][$data] : "");
}
function getDADataFromDAID($DAID, $data){
global $db;
$db->bind('id', $DAID);
$delivery_arrangements = $db->query("SELECT * FROM delivery_arrangements WHERE id = :id");
return (count($delivery_arrangements) > 0 ? $delivery_arrangements[0][$data] : "");
}
modul/arrangements/delivery/delivery.list.php
+6 -4
View File
@@ -31,15 +31,17 @@ $qweqwe = array();
foreach ($data as $key => $value) {
if($value["status"] == "1"){
$status = "Delivery <br/> Request <br/> <span class='sent'>Sent</span>";
}elseif($value["delivery_type"] == "2"){
}elseif($value["status"] == "2"){
$status = "Delivery <br/> Request <br/> Accepted";
}elseif($value["delivery_type"] == "3"){
}elseif($value["status"] == "3"){
$status = "Delivery <br/> Request <br/> Completed";
}elseif($value["delivery_type"] == "4"){
}elseif($value["status"] == "4"){
$status = "Order <br/> Closed";
}elseif($value["status"] == "5"){
$status = "Delivery <br/> Request <br/> Rejected";
}
if($value["delivery_type"] == "1"){
$delivery_type = "Inhouse Services";
$delivery_type = "Inhouse Services";
$delivery_details = "Delivery Date : " . date('d/m/Y', strtotime($value["delivery_date"]));
$delivery_details .= "<br/>Vehicle No : " . $value["vehicle_no"];
$delivery_details .= "<br/>Contact Person : " . $value["driver_contact_person"];
modul/arrangements/delivery/delivery.tpl.php
+4 -4
View File
@@ -37,13 +37,13 @@ th.dt-body-center,
<div class="caption">
<i class="fa fa-cogs"></i><strong>Delivery Arrangement Status</strong>
</div>
</div>
<div class="portlet-body">
<div class="col-md-12">
<a class="btn red btn-circle btn-outline pull-right" href="#form_add" data-toggle="modal">
<div class="actions">
<a class="btn white btn-circle btn-outline pull-right" href="#form_add" data-toggle="modal">
Add New <i class="fa fa-plus"></i>
</a>
</div>
</div>
<div class="portlet-body">
<table class="table table-striped table-bordered table-hover" id="delivery-arrangements">
<thead>
<tr role="row" class="heading">
modul/arrangements/delivery/init.php
+77 -31
View File
@@ -175,43 +175,89 @@ function the_delivery_arrangement(){
$db->bind("status", "3");
$db->bind("so_id", $so_id);
$soUpdate = $db->query("UPDATE `shipping_orders` SET `status`=:status WHERE so_id = :so_id");
//create messages
$db->bind("message", "Your Delivery Arrangement have been created.");
$db->bind("chat_type", "9");
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//find room for current so
$room_id = getRoomIDFromSO($so_id);
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
$insideRoom = getUserInRoom($room_id);
foreach($insideRoom as $key => $value){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
if($delivery_type == 2 || $delivery_type == 4){
$db->bind("message", "Have you received your goods?");
$db->bind("chat_type", "13");
$db->bind("decision", 0);
$db->bind("decision_type", 0);
$db->bind("delivery_arrangement_id", $delivery_arrangement_id);
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id, decision, decision_type, delivery_arrangement_id) VALUES (:message,:chat_type,:from_id, :decision, :decision_type, :delivery_arrangement_id)");
$message_id = $db->lastInsertId();
//find room for current so
$room_id = getRoomIDFromSO($so_id);
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
$insideRoom = getUserInRoom($room_id);
foreach($insideRoom as $key => $value){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
}else{
$db->bind("message", "Please confirm or reschedule your delivery arrangements.");
$db->bind("chat_type", "14");
$db->bind("decision", 0);
$db->bind("decision_type", 0);
$db->bind("delivery_arrangement_id", $delivery_arrangement_id);
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id, decision, decision_type, delivery_arrangement_id) VALUES (:message,:chat_type,:from_id, :decision, :decision_type, :delivery_arrangement_id)");
$message_id = $db->lastInsertId();
//find room for current so
$room_id = getRoomIDFromSO($so_id);
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
$insideRoom = getUserInRoom($room_id);
foreach($insideRoom as $key => $value){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
}
}
//create messages
$db->bind("message", "Your Delivery Arrangement have been created.");
$db->bind("chat_type", "9");
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//find room for current so
$room_id = getRoomIDFromSO($so_id);
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
$db->bind("message", "Have you received your goods?");
$db->bind("chat_type", "13");
$db->bind("decision", 0);
$db->bind("decision_type", 0);
$db->bind("delivery_arrangement_id", $delivery_arrangement_id);
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id, decision, decision_type, delivery_arrangement_id) VALUES (:message,:chat_type,:from_id, :decision, :decision_type, :delivery_arrangement_id)");
$message_id = $db->lastInsertId();
//find room for current so
$room_id = getRoomIDFromSO($so_id);
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
}
}
if ($delivery_arrangement_itemsCreate && $soUpdate) {
if ($delivery_arrangement_itemsCreate) {
return new Response("SUCCESS", 200);
} else {
return new Response('FAILED', 201);
modul/arrangements/shipment/init.php
+7
View File
@@ -176,6 +176,13 @@ function the_shipment_arrangement(){
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
$insideRoom = getUserInRoom($room_id);
foreach($insideRoom as $key => $value){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
}
}
modul/arrangements/shipment/shipment.tpl.php
+5 -4
View File
@@ -36,13 +36,14 @@ th.dt-body-center,
<div class="caption">
<i class="fa fa-cogs"></i><strong>Shipment Arrangement Status</strong>
</div>
</div>
<div class="portlet-body">
<div class="col-md-12">
<a class="btn red btn-circle btn-outline pull-right" href="#form_add" data-toggle="modal">
<div class="actions">
<a class="btn white btn-circle btn-outline pull-right" href="#form_add" data-toggle="modal">
Add New <i class="fa fa-plus"></i>
</a>
</div>
</div>
<div class="portlet-body">
<table class="table table-striped table-bordered table-hover" id="shipment-arrangements">
<thead>
<tr role="row" class="heading">
modul/arrangements/warehouse/init.php
+19 -12
View File
@@ -23,18 +23,13 @@ function create_warehouse_arrangement_css() {
function create_warehouse_arrangement_js() {
?>
<script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/jquery-validation/js/jquery.validate.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/jquery-validation/js/additional-methods.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js" type="text/javascript"></script>
<script src="/assets/global/scripts/datatable.js" type="text/javascript"></script>
<script src="/assets/global/plugins/datatables/datatables.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-daterangepicker/daterangepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-timepicker/js/bootstrap-timepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/clockface/js/clockface.js" type="text/javascript"></script>
<script src="/assets/modul-js/arrangements/warehouse-arrangement/create.js" type="text/javascript"></script>
<?php
}
@@ -104,14 +99,13 @@ function the_warehouse_arrangement(){
."<td><input name='warehouse_arrangement_items[".$count."][actual_weight_ctn]' id='warehouse_arrangement_items[".$count."][actual_weight_ctn]' class='form-control input-sm warehouse_arrangement_items weight' /></td>"
."<td>".getItemBalance($shipping_order_item['id'], $so_id)."</td>"
."<td></td>"
."<td><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input name='warehouse_arrangement_items[".$count."][isDamaged]' id='warehouse_arrangement_items[".$count."][isDamaged]' type='checkbox' class='checkboxes' value='1'><span></span></label></td>"
."<td><label class='mt-checkbox mt-checkbox-single mt-checkbox-outline'><input name='warehouse_arrangement_items[".$count."][isDamaged]' id='warehouse_arrangement_items[".$count."][isDamaged]' type='checkbox' class='checkboxes' onchange='toggleCheckbox(this)' value='1'><span></span></label></td>"
."<td>
<div class='fileinput fileinput-new' data-provides='fileinput'>
<div class='fileinput-new thumbnail' style='width: 100px; height: auto;'>
<img id='uploadPreview[".$count."]' src='".$shipping_order_item['image']."' alt='' /> </div>
<div class='fileinput-preview fileinput-exists thumbnail' style='max-width: 200px; max-height: 150px;'>
<img id='uploadPreview[".$count."]' src='".($shipping_order_item['image'] <> '' ? $shipping_order_item['image'] : "http://www.placehold.it/200/EFEFEF/AAAAAA&text=no+image") ."' alt='' />
</div>
<div>
<span class='btn default btn-file'>
<span class='fileinput-new'> Select image </span>
@@ -251,6 +245,14 @@ function the_warehouse_arrangement(){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
$insideRoom = getUserInRoom($room_id);
foreach($insideRoom as $key => $value){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
if($type == "decision_request"){
//create messages
$db->bind("message", "Decision Requested.");
@@ -288,12 +290,17 @@ function the_warehouse_arrangement(){
$unread_order = "";
}
if(getStatusCompanyFriend($_SESSION['company_id']) > 0 && $_SESSION['group_id'] == 1){
$unread_contact = getStatusCompanyFriend($_SESSION['company_id']);
$unread_contact = getStatusCompanyFriend($_SESSION['company_id']) + getContactUnread();
}else{
$unread_contact = "";
$unread_contact = getContactUnread();
}
if(getSOUnread() > 0){
$unread_so = getSOUnread();
}else{
$unread_so = "";
}
$output_array = array();
$output_array[] = array('unread_order' => $unread_order, 'unread_contact' => $unread_contact);
$output_array[] = array('unread_order' => $unread_order, 'unread_contact' => $unread_contact, 'unread_so' => $unread_so);
return json_encode( $output_array );
});
modul/arrangements/warehouse/warehouse.tpl.php
+1 -1
View File
@@ -76,7 +76,7 @@ th.dt-body-center,
<div class="form-group">
<label class="control-label col-md-3">Title</label>
<div class="col-md-9">
<p class="form-control-static">Unmatched Quantity</p>
<p class="form-control-static" id="decision_request_title">Unmatched Quantity</p>
</div>
</div>
<div class="form-group">
modul/common/contact/companies.tpl.php
+2 -2
View File
@@ -10,7 +10,7 @@
</div>
<ul class="nav nav-tabs">
<li>
<a href="/contacts"> Contacts </a>
<a href="/contacts"> Contacts <?php if(getContactUnread() <> ""){ ?><span class="badge badge-danger pull-right"><?php echo getContactUnread();?></span><?php } ?> </a>
</li>
<?php if($_SESSION['group_id'] == 1){ ?>
<li class="active">
@@ -26,7 +26,7 @@
</li>
<?php }else{ ?>
<li class="active">
<a href="/companies"> Freight Forwarders <?php if(getStatusCompanyFriend($_SESSION['company_id']) > 0){?><span class="badge badge-danger pull-right"><?php echo getStatusCompanyFriend($_SESSION['company_id']); ?></span><?php } ?> </a>
<a href="/companies"> Freight Forwarders <?php if($unread_contact <> ""){?><span class="badge badge-danger pull-right"><?php echo $unread_contact; ?> </span><?php }?></a>
</li>
<?php } ?>
</ul>
modul/common/contact/contact.list.php
+8 -3
View File
@@ -15,7 +15,7 @@ $count = $data[0]["jumlah"];
$totalData = $count;
$totalFiltered = $totalData;
$sql = "SELECT DISTINCT user_detail.first_name as first_name,users.user_id as user_id, users.username as username, groups.name FROM `user_friend` join users on user_friend.friend_id = users.user_id join user_detail on user_friend.friend_id = user_detail.user_id join groups on users.group_id = groups.group_id WHERE user_friend.user_id = '". $_SESSION['user_id'] ."'";
$sql = "SELECT DISTINCT user_friend.status as status, user_detail.first_name as first_name,users.user_id as user_id, users.username as username, groups.name FROM `user_friend` join users on user_friend.friend_id = users.user_id join user_detail on user_friend.friend_id = user_detail.user_id join groups on users.group_id = groups.group_id WHERE user_friend.user_id = '". $_SESSION['user_id'] ."'";
if( !empty($requestData['columns'][0]['search']['value']) ){ //name
$sql.=" AND user_detail.first_name LIKE '".$requestData['columns'][0]['search']['value']."%' ";
}
@@ -35,12 +35,17 @@ foreach ($data as $key => $value) {
$nestedData = array();
$nestedData[] = "<img style='border-radius:50% !important;width:70px !important;height:auto !important' src='".showImage($value["user_id"])."' alt='' />";
$nestedData[] = "<a class='view-detail' data-id ='". $value["user_id"] ."'>" .ucwords($value["first_name"]) ."</a>";
$nestedData[] = $value["username"];
$nestedData[] = "<a class='view-detail' data-id ='". $value["user_id"] ."'>" .ucwords($value["first_name"]) ."</a>" . ($value['status'] == 0 ? " <span class='badge badge-danger'> new </span>" : '');
$nestedData[] = $value["username"] ;
$nestedData[] = ucwords(strtolower($value["name"]));
$qweqwe[] = $nestedData;
}
if(getContactUnread() > 0){
$db->query("UPDATE user_friend set status = 1 where user_id = '". $_SESSION['user_id'] ."'");
}
$json_data = array(
"draw" => intval( $requestData['draw'] ), // for every request/draw by clientside , they send a number as a parameter, when they recieve a response/data they first check the draw number, so we are sending same number in draw.
"recordsTotal" => intval( $totalData ), // total number of records
modul/common/contact/contact.tpl.php
+3 -3
View File
@@ -16,7 +16,7 @@
</div>
<ul class="nav nav-tabs">
<li class="active">
<a href="/contacts"> Contacts </a>
<a href="/contacts"> Contacts <?php if(getContactUnread() <> ""){ ?><span class="badge badge-danger pull-right"><?php echo getContactUnread();?></span><?php } ?> </a>
</li>
<?php if($_SESSION['group_id'] == 1){ ?>
<li>
@@ -27,11 +27,11 @@
$unread_contact = "";
}
?>
<a href="/companies"> Importers <span class="badge badge-danger pull-right"><?php echo $unread_contact; ?> </span></a>
<a href="/companies"> Importers <?php if($unread_contact <> ""){?><span class="badge badge-danger pull-right"><?php echo $unread_contact; ?> </span><?php }?></a>
</li>
<?php }else{ ?>
<li>
<a href="/companies"> Freight Forwarders <?php if(getStatusCompanyFriend($_SESSION['company_id']) > 0){?><span class="badge badge-danger pull-right"><?php echo getStatusCompanyFriend($_SESSION['company_id']); ?></span><?php } ?> </a>
<a href="/companies"> Freight Forwarders <?php if($unread_contact <> ""){?><span class="badge badge-danger pull-right"><?php echo $unread_contact; ?> </span><?php }?></a>
</li>
<?php } ?>
</ul>
modul/common/dashboard/dashboard.func.php
+2
View File
@@ -36,6 +36,8 @@ function getGeneralStatus($so_id){
return "Delivery Request Completed";
}elseif($daStatus == 4){
return "Order Completed";
}elseif($daStatus == 5){
return "Delivery Request Rejected";
}
}else{
return "Order Created";
modul/common/dashboard/dashboard.so.list.php
+4 -3
View File
@@ -10,8 +10,7 @@ $requestData= $_REQUEST;
1 => 'created_on',
3 => 'order_no',
4 => 'marking',
5 => 'supplier_company_name',
6 => 'forwarder_id',
5 => 'supplier_company_name',
);
$count = $data[0]["jumlah"];
$totalData = $count;
@@ -37,7 +36,9 @@ $requestData= $_REQUEST;
$nestedData[] = $value['order_no'];
$nestedData[] = $value['marking'];
$nestedData[] = $value['supplier_company_name'];
$nestedData[] = getCompanyData($value['forwarder_id'], "company_id", "name");
if($_SESSION['group_id'] <> 1){
$nestedData[] = getCompanyData($value['forwarder_id'], "company_id", "name");
}
$nestedData[] = (getSAData($value['so_id'], "shipment_no") <> "" ? getSAData($value['so_id'], "shipment_no") : "N/A");
$nestedData[] = (getSAData($value['so_id'], "container_no") <> "" ? getSAData($value['so_id'], "container_no") : "N/A");
$nestedData[] = (getWAData($value['so_id'], "warehouse_receive_note_no") <> "" ? getWAData($value['so_id'], "warehouse_receive_note_no") : "N/A");
modul/common/dashboard/dashboard.so.tpl.php
+3 -1
View File
@@ -112,7 +112,9 @@ th.dt-body-center,
<th>Order No</th>
<th>Marking</th>
<th>Supplier<br/>Name</th>
<th>Forwarder</th>
<?php if($_SESSION['group_id'] <> 1){ ?>
<th>Forwarder</th>
<?php } ?>
<th>Shipment<br/>No</th>
<th>Cont<br/>No</th>
<th>Warehouse<br/>Recv<br/>Note</th>
modul/common/messenger/init.php
+244 -29
View File
@@ -53,6 +53,7 @@ function order_css() {
<link href="/assets/global/plugins/dropzone/dropzone.min.css" rel="stylesheet" type="text/css" />
<link href="/assets/global/plugins/dropzone/basic.min.css" rel="stylesheet" type="text/css" />
<link href="/assets/global/plugins/bootstrap-wysihtml5/bootstrap-wysihtml5.css" rel="stylesheet" type="text/css" />
<link href="/assets/global/plugins/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css" />
<link href="/assets/global/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />
<link href="/assets/global/plugins/bootstrap-editable/inputs-ext/address/address.css" rel="stylesheet" type="text/css" />
<link href="/assets/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
@@ -68,12 +69,14 @@ function order_js() {
<script src="/assets/modul-js/common/messenger/emoji/js/jquery.emojipicker.min.js" type="text/javascript" ></script>
<script src="/assets/modul-js/common/messenger/emoji/js/jquery.emojis.min.js" type="text/javascript" ></script>
<script src="/assets/global/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js" type="text/javascript"></script>
<script src="/assets/global/scripts/components-date-time-pickers.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-editable/inputs-ext/address/address.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-editable/inputs-ext/wysihtml5/wysihtml5.js" type="text/javascript"></script>
<script src="/assets/global/plugins/jquery-validation/js/jquery.validate.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/jspdf.min.js"></script>
<script src="/assets/modul-js/common/messenger/order.min.js" type="text/javascript"></script>
<script src="/assets/modul-js/common/messenger/order.min.js?v=<?php echo rand();?>" type="text/javascript"></script>
<?php
}
@@ -412,8 +415,18 @@ function the_messenger(){
global $db;
$message_id = $request->get('message_id');
$decision = $request->get('decision');
if( $request->get('reason') && $request->get('scheduled_date')){
$reason = $request->get('reason');
$scheduled_date = $request->get('scheduled_date');
}
if($request->get('id')){
$DAID = $request->get('id');
}
$db->bind("message_id", $message_id);
$data = $db->query("SELECT * FROM `notice_room_message` WHERE message_id = :message_id");
$room_id = $data[0]["room_id"];
@@ -434,38 +447,119 @@ function the_messenger(){
$db->bind("warehouse_arrangement_id", $warehouse_arrangement_id);
$data = $db->query("UPDATE `warehouse_arrangements` SET status = :status WHERE id = :warehouse_arrangement_id");
}
}
//create messages
if($decision == 1){
$text = (getProfileData($_SESSION['user_id'], "first_name") <> "" ? getProfileData($_SESSION['user_id'], "first_name") : get_data($_SESSION['user_id'], "username")) . " have agreed to accept <a class='decision-request-details' data-id='".$warehouse_arrangement_id."' data-message_id='".$message_id."' data-decision='".$decision."'>this</a> decision request.";
//create messages
if($decision == 1){
$text = (getProfileData($_SESSION['user_id'], "first_name") <> "" ? getProfileData($_SESSION['user_id'], "first_name") : get_data($_SESSION['user_id'], "username")) . " have agreed to accept <a class='decision-request-details' data-id='".$warehouse_arrangement_id."' data-message_id='".$message_id."' data-decision='".$decision."'>this</a> decision request.";
}else{
$text = (getProfileData($_SESSION['user_id'], "first_name") <> "" ? getProfileData($_SESSION['user_id'], "first_name") : get_data($_SESSION['user_id'], "username")) . " have agreed to declined <a class='decision-request-details' data-id='".$warehouse_arrangement_id."' data-message_id='".$message_id."' data-decision='".$decision."'>this</a> decision request.";
}
$db->bind("message", $text);
$db->bind("chat_type", "1");
$db->bind("from_id", $_SESSION['user_id']);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
//create unread status
$MembersInRoom = getUserInRoom($room_id);
foreach ($MembersInRoom as $key => $value){
if($value['user_id'] <> $_SESSION['user_id']){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
}
}else{
$text = (getProfileData($_SESSION['user_id'], "first_name") <> "" ? getProfileData($_SESSION['user_id'], "first_name") : get_data($_SESSION['user_id'], "username")) . " have agreed to declined <a class='decision-request-details' data-id='".$warehouse_arrangement_id."' data-message_id='".$message_id."' data-decision='".$decision."'>this</a> decision request.";
}
$db->bind("message", $text);
$db->bind("chat_type", "1");
$db->bind("from_id", $_SESSION['user_id']);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
//create unread status
$MembersInRoom = getUserInRoom($room_id);
foreach ($MembersInRoom as $key => $value){
if($value['user_id'] <> $_SESSION['user_id']){
$delivery_arrangement_id = getMessageData($message_id, "delivery_arrangement_id");
if($decision == 1){
$db->bind("status", "2");
$db->bind("delivery_arrangement_id", $delivery_arrangement_id);
$data = $db->query("UPDATE `delivery_arrangements` SET status = :status WHERE id = :delivery_arrangement_id");
//create messages
$text = (getProfileData($_SESSION['user_id'], "first_name") <> "" ? getProfileData($_SESSION['user_id'], "first_name") : get_data($_SESSION['user_id'], "username")) . " have agreed to accept <a class='delivery-request-details' data-id='".$delivery_arrangement_id."' data-message_id='".$message_id."' data-decision='".$decision."'>this</a> decision request.";
$db->bind("message", $text);
$db->bind("chat_type", "1");
$db->bind("from_id", $_SESSION['user_id']);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
//create unread status
$MembersInRoom = getUserInRoom($room_id);
foreach ($MembersInRoom as $key => $value){
if($value['user_id'] <> $_SESSION['user_id']){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
}
//create messages
$db->bind("message", "Have you received your goods?");
$db->bind("chat_type", "13");
$db->bind("decision", 0);
$db->bind("decision_type", 1);
$db->bind("delivery_arrangement_id", $delivery_arrangement_id);
$db->bind("from_id", $_SESSION['user_id']);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id, decision, decision_type, delivery_arrangement_id) VALUES (:message,:chat_type,:from_id, :decision, :decision_type, :delivery_arrangement_id)");
$message_id = $db->lastInsertId();
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
}else{
$db->bind("status", "5");
$db->bind("delivery_arrangement_id", $delivery_arrangement_id);
$data = $db->query("UPDATE `delivery_arrangements` SET status = :status WHERE id = :delivery_arrangement_id");
//create messages
$text = (getProfileData($_SESSION['user_id'], "first_name") <> "" ? getProfileData($_SESSION['user_id'], "first_name") : get_data($_SESSION['user_id'], "username")) . " have agreed to accept <a class='delivery-request-details' data-id='".$delivery_arrangement_id."' data-message_id='".$message_id."' data-decision='".$decision."'>this</a> decision request.";
$db->bind("message", $text);
$db->bind("chat_type", "1");
$db->bind("from_id", $_SESSION['user_id']);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
//create unread status
$MembersInRoom = getUserInRoom($room_id);
foreach ($MembersInRoom as $key => $value){
if($value['user_id'] <> $_SESSION['user_id']){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
}
}
}
return new Response("SUCCESS", 200);
});
@@ -518,6 +612,127 @@ function the_messenger(){
</div>';
return($html);
});
$app->post('/messenger/order/get-delivery-arrangement', function(Request $request) {
global $db;
$delivery_arrangement_id = $request->get('id');
$message_id = $request->get('message_id');
$delivery_type = getDADataFromDAID($delivery_arrangement_id, "delivery_type");
if(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 1){
$delivery_type = "Inhouse Services";
}elseif(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 2){
$delivery_type = "Courier Services";
}elseif(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 3){
$delivery_type = "Outsource Services";
}elseif(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 4){
$delivery_type = "Self Collect";
}
$html = "";
$html .= '
<h3 class="form-section">Delivery Arrangement Details</h3>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Delivery Type :</label>
<div class="col-md-8">
<p class="form-control-static">'. $delivery_type .'</p>
</div>
</div>
</div>
</div><div class="row">';
if(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 1 || getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 3 ){
$html .= '
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Delivery Date :</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "delivery_date").' </p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Driver Name:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "driver_contact_person").' </p>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Driver Contact:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "driver_contact_person_no").' </p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Vehicle No:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "vehicle_no").' </p>
</div>
</div>
</div>';
}elseif(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 2){
$html .= '
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Courier Service:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "courier_service_name").' </p>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Tracking No:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "tracking_no").' </p>
</div>
</div>
</div>';
}elseif(getDADataFromDAID($delivery_arrangement_id, "delivery_type") == 4){
$html .= '
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Warehouse:</label>
<div class="col-md-8">
<p class="form-control-static"> '. get_warehouse(getDADataFromDAID($delivery_arrangement_id, "warehouse_id"), "warehouse_name").' </p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Contact Person:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "warehouse_contact_person").' </p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">Contact Person No:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "warehouse_contact_person_no").' </p>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-4">Address:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "warehouse_address").' </p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">City:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "warehouse_zip").' '. getDADataFromDAID($delivery_arrangement_id, "warehouse_city").' </p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4">State:</label>
<div class="col-md-8">
<p class="form-control-static"> '. getDADataFromDAID($delivery_arrangement_id, "warehouse_state").' </p>
</div>
</div>
</div>';
}
$html .= '</div>';
return($html);
});
$app->post('/messenger/get-staff', function(Request $request) {
global $db;
$room_id = $request->get('room_id');
@@ -563,7 +778,7 @@ function the_messenger(){
foreach($data as $key => $value){
if(get_data($value['friend_id'], "group_id") == get_data($value['user_id'], "group_id")){
$table .= "<tr>
<td>".getProfileData($value['friend_id'], "first_name") . " " . getProfileData($value['user_id'], "last_name")."</td>
<td>".getProfileData($value['friend_id'], "first_name") . " " . getProfileData($value['friend_id'], "last_name")."</td>
<td>".get_data($value['friend_id'], "username")."</td>
<td><div style='padding-top: 0px;padding-bottom: 0px;' class='mt-checkbox-list'><label class='mt-checkbox mt-checkbox-outline' style='margin-bottom: 0px;'><input style='margin-top: 0px;' type='checkbox' id='user_ids' name='user_ids[]' value=".$value['friend_id']."><span></span></label></div></td>
</tr>";
modul/common/messenger/messenger.func.php
-19
View File
@@ -82,25 +82,6 @@ function roomIDExist($room_id) {
return (count($row) > 0 ? true : false);
}
function getRoomUnread($room_id){
global $db;
$db->bind("room_id", $room_id);
$db->bind("user_id", $_SESSION['user_id']);
$row = $db->query("SELECT * FROM notice_unread WHERE room_id = :room_id and user_id = :user_id and status = 0;");
return (count($row) > 0 ? count($row) : "");
}
function getOrderUnread(){
global $db;
$db->bind("user_id", $_SESSION['user_id']);
$row = $db->query("SELECT * FROM notice_unread join notice_rooms on notice_unread.room_id = notice_rooms.room_id WHERE notice_unread.user_id = :user_id and notice_unread.status = 0 and notice_rooms.order_id <> null");
return (count($row) > 0 ? count($row) : "");
}
function getUserInRoom($room_id){
global $db;
$db->bind("room_id", $room_id);
modul/common/messenger/order.list.php
+26 -2
View File
@@ -1,7 +1,7 @@
<?php
$data = $db->query("SELECT notice_messages.decision_type as decision_type,notice_messages.decision as decision,notice_messages.warehouse_arrangement_id as warehouse_arrangement_id,notice_messages.reply_id as reply_id, notice_messages.file as file, notice_messages.file_name as file_name, notice_messages.message_id as message_id, notice_messages.message_id as message_id, notice_messages.message as message, notice_messages.from_id as from_id, notice_messages.created_on as created_on, notice_messages.chat_type as chat_type, notice_messages.mime as mime FROM `notice_messages` join notice_room_message on notice_messages.message_id = notice_room_message.message_id WHERE notice_room_message.room_id = '".$room_id."' && notice_messages.message_id > '".$id."' ORDER BY notice_messages.message_id ASC");
$data = $db->query("SELECT notice_messages.delivery_arrangement_id as delivery_arrangement_id, notice_messages.decision_type as decision_type,notice_messages.decision as decision,notice_messages.warehouse_arrangement_id as warehouse_arrangement_id,notice_messages.reply_id as reply_id, notice_messages.file as file, notice_messages.file_name as file_name, notice_messages.message_id as message_id, notice_messages.message_id as message_id, notice_messages.message as message, notice_messages.from_id as from_id, notice_messages.created_on as created_on, notice_messages.chat_type as chat_type, notice_messages.mime as mime FROM `notice_messages` join notice_room_message on notice_messages.message_id = notice_room_message.message_id WHERE notice_room_message.room_id = '".$room_id."' && notice_messages.message_id > '".$id."' ORDER BY notice_messages.message_id ASC");
$counts = 0;
$html = "";
@@ -316,7 +316,31 @@ if(date("Y-m-d", strtotime($request->get('last_date'))) <> date("Y-m-d", strtoti
<span class="mt-comment-date">'.date("H:i", strtotime($value['created_on'])).'</span>
</div>
<div class="mt-comment-text">'.$value['message'] .'</div>';
if($value['warehouse_arrangement_id'] <> null ){
if($value['delivery_arrangement_id'] <> null ){
$html .= '<div class="mt-comment-details">
<ul class="mt-comment-actions">
<li>
<a style="text-transform:capitalize;" class="delivery-request-details" data-id="'.$value['delivery_arrangement_id'].'" data-message_id="'.$value['message_id'].'" data-decision="'.$value['decision'].'">Details</a>
</li>
</ul>
</div>';
}
$html .= '</div>
</div>';
$html .= '</li>';
}elseif($value['chat_type']== 14){
$html .= '<li class="'.$class.'" id="cc" data-id="'.$value['message_id'].'">';
$html .= '<div class="mt-comment" style="background: #f9f9f9;border-radius: 10px !important;">
<div class="mt-comment-img">
<img class="avatar" alt="" src="'. showImage($value["from_id"]).'">
</div>
<div class="mt-comment-body">
<div class="mt-comment-info">
<span class="mt-comment-author">'.($value['from_id'] == 1 ? "Bot" : (getProfileData($value['from_id'], "first_name") <> "" ? getProfileData($value['from_id'], "first_name") : get_data($value['from_id'], "username"))).'</span>
<span class="mt-comment-date">'.date("H:i", strtotime($value['created_on'])).'</span>
</div>
<div class="mt-comment-text">'.$value['message'] .'</div>';
if($value['delivery_arrangement_id'] <> null ){
$html .= '<div class="mt-comment-details">
<ul class="mt-comment-actions">
<li>
modul/common/messenger/order.tpl.php
+53 -3
View File
@@ -440,6 +440,56 @@ tr.eror {
</div>
</div>
</div>
<div class="modal fade modal-scroll in" id="form_decision_reject" role="basic" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
<h4 class="modal-title">Decision Reject</h4>
</div>
<form class="form-horizontal" id="decision_reject">
<div class="modal-body form">
<div class="row">
<div class="form-body" style="padding-top: 10px;padding-bottom: 10px;">
<div class="form-group">
<label class="control-label col-md-3">Title</label>
<div class="col-md-9">
<p class="form-control-static">Delivery Request Reschedule</p>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">New Schedule Date</label>
<div class="col-md-9">
<div class="input-group date form_datetime form_datetime bs-datetime">
<input type="text" size="16" id="scheduled_date" name="scheduled_date" class="form-control">
<span class="input-group-addon">
<button class="btn default date-set" type="button">
<i class="fa fa-calendar"></i>
</button>
</span>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Reason</label>
<div class="col-md-9">
<textarea class="form-control" rows="4" id="reason" name="reason"></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<div class="row pull-right">
<div class="col-md-12">
<a class="btn green submit"> Finish!</a>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<div class="modal fade in bs-modal-lg " id="delivery-request-details" tabindex="-1" role="basic" aria-hidden="true">
<div class="modal-dialog modal-lg ">
<div class="modal-content form">
@@ -460,7 +510,7 @@ tr.eror {
<a class="btn green decision-yes">Yes</a>
<a class="btn dark btn-outline decision-no">No</a>
<?php }else{?>
Your importer haven't receive their goods.
Your importer haven't confirm their schedule.
<?php } ?>
</div>
</form>
@@ -497,7 +547,7 @@ tr.eror {
</div>
</li>
<?php } ?>
<?php if (getinRoomRoles($room_id) == 0){ ?>
<?php if (getinRoomRoles($room_id) == 0 && $_SESSION['group_id'] == 2){ ?>
<li align="center">
<div class="actions">
<a class="btn btn-circle btn-default add-member" data-id="2" style="margin-left: 15px;">
@@ -524,7 +574,7 @@ tr.eror {
</div>
</li>
<?php } ?>
<?php if (getinRoomRoles($room_id) == 0){ ?>
<?php if (getinRoomRoles($room_id) == 0 && $_SESSION['group_id'] == 1){ ?>
<li align="center">
<div class="actions">
<a class="btn btn-circle btn-default add-member" data-id="1" style="margin-left: 15px;">
modul/orders/shipping-order/create.tpl.php
+1 -1
View File
@@ -551,7 +551,7 @@
</div>
<div class="form-actions">
<div class="row pull-right">
<div class="col-md-12">
<div class="col-md-12" id="form-actions">
<a class="btn green button-submit2" id="finish2"> Add Item</a>
</div>
</div>
modul/orders/shipping-order/init.php
+86 -231
View File
@@ -36,7 +36,7 @@ function create_so_js() {
<script src="/assets/global/scripts/datatable.js" type="text/javascript"></script>
<script src="/assets/global/plugins/datatables/datatables.min.js" type="text/javascript"></script>
<script src="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.js" type="text/javascript"></script>
<script src="/assets/modul-js/orders/shipping-order/create.min.js" type="text/javascript"></script>
<script src="/assets/modul-js/orders/shipping-order/create.min.js?v=<?php echo rand(); ?>" type="text/javascript"></script>
<?php
}
function so_js() {
@@ -92,60 +92,7 @@ function the_so(){
return "";
});
$app->post('/shipping-order/getPOItems', function(Request $request) {
global $db;
$po_id = $request->get('po_id');
$counter = 1;
$qweqwe = array();
$db->bind("po_id",$po_id);
$data = $db->query("SELECT * FROM purchase_order_items WHERE po_id = :po_id");
foreach ($data as $key => $value) {
$nestedData = array();
$nestedData[] = $counter;
$nestedData[] = "<p id='shippingorderitems[".$counter."][product_name]' class='form-control-static'>".$value['product_name']."</p>";
$nestedData[] = "<p id='shippingorderitems[".$counter."][model_no]' class='form-control-static'>".$value['model_no']."</p>";
$nestedData[] = "<p id='shippingorderitems[".$counter."][uom]' class='form-control-static'>".$value['uom']."</p>";
$nestedData[] = "<p id='shippingorderitems[".$counter."][quantity]' class='form-control-static'>".$value['quantity']."</p>";
$nestedData[] = "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'><p id='shippingorderitems[".$counter."][packaging_cbm]' class='form-control-static'>0m³</p><i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li id='shippingorderitems[".$counter."][packaging_height]'>0</li><li id='shippingorderitems[".$counter."][packaging_width]'>0</li><li id='shippingorderitems[".$counter."][packaging_depth]'>0</li></ul></div>";
$nestedData[] = "<div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'><p id='shippingorderitems[".$counter."][weight]' class='form-control-static'>0kg</p><i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li id='shippingorderitems[".$counter."][packaging_gross]'>0</li><li id='shippingorderitems[".$counter."][packaging_nett]'>0kg/li></ul></div>";
$nestedData[] = "<div class='col-md-6'><img id='shippingorderitems[".$counter."][image]' style='max-width: 100px; max-height: 100px;' src='http://www.placehold.it/200/EFEFEF/AAAAAA&text=no+image'/></div>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][product_name]' style='display:none;' value='".$value['product_name']."'>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][description]' style='display:none;' value='".$value['description']."'>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][model_no]' style='display:none;' value='".$value['model_no']."'>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][item_code]' style='display:none;' value='".$value['item_code']."'>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][brand_no]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][uom]' style='display:none;' value='".$value['uom']."'>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][quantity]' style='display:none;' value='".$value['quantity']."'>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_quantity]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_type1]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_type2]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_cbm]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_height]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_width]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_depth]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_gross]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][packaging_nett]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][image]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][image2]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][image3]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][image4]' style='display:none;' value=''>"
."<input class='hiden-input' name='shippingorderitems[".$counter."][po_item_id]' style='display:none;' value='".$value['id']."'>";
$nestedData[] = "<a class='delete'>Delete</a> <a class='edit'>Edit</a>";
$qweqwe[] = $nestedData;
$counter++;
}
$json_data = array(
"data" => $qweqwe // total data array
);
return json_encode($json_data);
});
$app->post('/shipping-order/getModalSuccess', function(Request $request) {
global $db;
@@ -234,23 +181,6 @@ function the_so(){
return json_encode( $output_array );
});
$app->post('/shipping-order/getMarkingNumber', function(Request $request) {
global $db;
$forwarder_id = $request->get('forwarder_id');
$company_id = $_SESSION['company_id'];
$branch_id = $_SESSION['branch_id'];
$po_id = $request->get('po_id');
$marking_no = getMarkingNo($company_id, $forwarder_id, $branch_id);
$order_no = getOrderNumber($company_id, $branch_id);
if($po_id <> 0 && $po_id <> null && $po_id > 0){
return getPOData($po_id, "marking_no");
}else{
return $marking_no . "/" . $order_no;
}
});
$app->post('/shipping-order/list', function(Request $request) {
$curpage = $request->get('page');
include 'so.list.php';
@@ -282,13 +212,7 @@ function the_so(){
$user_id = $_SESSION['user_id'];
$order_type = $request->get('order_type');
if($order_type == "1"){
$forwarder_id = $request->get('forwarder_id');
}else{
$po_id = $request->get('po_id');
$forwarder_id = getPOData($po_id, "forwarder_id");
}
$forwarder_id = $request->get('forwarder_id');
$supplier = $request->get('supplier');
$supplier_contact_person = $request->get('supplier_contact_person');
$supplier_contact_person_no = $request->get('supplier_contact_person_no');
@@ -344,90 +268,47 @@ function the_so(){
}
}
if($order_type == "1"){
$db->bind("forwarder_id", $forwarder_id);
$db->bind("marking_no", "");
$db->bind("supplier_company_name", $supplier);
$db->bind("supplier_contact_person", $supplier_contact_person);
$db->bind("supplier_contact_person_no", $supplier_contact_person_no);
$db->bind("warehouse_name", $warehouse_name);
$db->bind("warehouse_address", $warehouse_address);
$db->bind("warehouse_city", $warehouse_city);
$db->bind("warehouse_zip", $warehouse_zip);
$db->bind("warehouse_state", $warehouse_state);
$db->bind("warehouse_country", $warehouse_country);
$db->bind("warehouse_contact_person", $warehouse_contact_person);
$db->bind("warehouse_contact_person_no", $warehouse_contact_person_no);
$db->bind("warehouse_id", $warehouse_id);
$db->bind("delivery_name", $delivery_name);
$db->bind("delivery_address", $delivery_address);
$db->bind("delivery_zip", $delivery_zip);
$db->bind("delivery_city", $delivery_city);
$db->bind("delivery_state", $delivery_state);
$db->bind("delivery_country", $delivery_country);
$db->bind("delivery_contact_person", $delivery_contact_person);
$db->bind("delivery_contact_person_no", $delivery_contact_person_no);
$db->bind("delivery_id", $delivery_id);
$db->bind("company_id", $company_id);
$db->bind("branch_id", $branch_id);
$soCreate = $db->query("INSERT INTO shipping_orders ( marking_no, supplier_company_name, supplier_contact_person, supplier_contact_person_no, warehouse_name, warehouse_address, warehouse_city, warehouse_zip, warehouse_state, warehouse_country, warehouse_contact_person, warehouse_contact_person_no, delivery_name, delivery_address, delivery_city, delivery_zip, delivery_state, delivery_country,delivery_contact_person,delivery_contact_person_no, branch_id, warehouse_id, delivery_id, company_id, forwarder_id) VALUES (:marking_no, :supplier_company_name, :supplier_contact_person, :supplier_contact_person_no, :warehouse_name, :warehouse_address, :warehouse_city, :warehouse_zip, :warehouse_state, :warehouse_country, :warehouse_contact_person, :warehouse_contact_person_no, :delivery_name, :delivery_address, :delivery_city, :delivery_zip, :delivery_state, :delivery_country, :delivery_contact_person, :delivery_contact_person_no, :branch_id, :warehouse_id, :delivery_id, :company_id, :forwarder_id);");
}else{
$db->bind("po_id", $po_id);
$db->bind("forwarder_id", $forwarder_id);
$db->bind("marking_no", $marking_no);
$db->bind("supplier_company_name", $supplier);
$db->bind("supplier_contact_person", $supplier_contact_person);
$db->bind("supplier_contact_person_no", $supplier_contact_person_no);
$db->bind("warehouse_name", $warehouse_name);
$db->bind("warehouse_address", $warehouse_address);
$db->bind("warehouse_city", $warehouse_city);
$db->bind("warehouse_zip", $warehouse_zip);
$db->bind("warehouse_state", $warehouse_state);
$db->bind("warehouse_country", $warehouse_country);
$db->bind("warehouse_contact_person", $warehouse_contact_person);
$db->bind("warehouse_contact_person_no", $warehouse_contact_person_no);
$db->bind("warehouse_id", $warehouse_id);
$db->bind("delivery_name", $delivery_name);
$db->bind("delivery_address", $delivery_address);
$db->bind("delivery_zip", $delivery_zip);
$db->bind("delivery_city", $delivery_city);
$db->bind("delivery_state", $delivery_state);
$db->bind("delivery_country", $delivery_country);
$db->bind("delivery_contact_person", $delivery_contact_person);
$db->bind("delivery_contact_person_no", $delivery_contact_person_no);
$db->bind("delivery_id", $delivery_id);
$db->bind("company_id", $company_id);
$db->bind("branch_id", $branch_id);
$soCreate = $db->query("INSERT INTO shipping_orders ( po_id,marking_no, supplier_company_name, supplier_contact_person, supplier_contact_person_no, warehouse_name, warehouse_address, warehouse_city, warehouse_zip, warehouse_state, warehouse_country, warehouse_contact_person, warehouse_contact_person_no, delivery_name, delivery_address, delivery_city, delivery_zip, delivery_state, delivery_country, delivery_contact_person, delivery_contact_person_no, branch_id, warehouse_id, delivery_id, company_id, forwarder_id) VALUES (:po_id, :marking_no, :supplier_company_name, :supplier_contact_person, :supplier_contact_person_no, :warehouse_name, :warehouse_address, :warehouse_city, :warehouse_zip, :warehouse_state, :warehouse_contact_person, :warehouse_contact_person_no, :warehouse_country, :delivery_name, :delivery_address, :delivery_city, :delivery_zip, :delivery_state, :delivery_country, :delivery_contact_person, :delivery_contact_person_no, :branch_id, :warehouse_id, :delivery_id, :company_id, :forwarder_id);");
}
$db->bind("forwarder_id", $forwarder_id);
$db->bind("marking_no", "");
$db->bind("supplier_company_name", $supplier);
$db->bind("supplier_contact_person", $supplier_contact_person);
$db->bind("supplier_contact_person_no", $supplier_contact_person_no);
$db->bind("warehouse_name", $warehouse_name);
$db->bind("warehouse_address", $warehouse_address);
$db->bind("warehouse_city", $warehouse_city);
$db->bind("warehouse_zip", $warehouse_zip);
$db->bind("warehouse_state", $warehouse_state);
$db->bind("warehouse_country", $warehouse_country);
$db->bind("warehouse_contact_person", $warehouse_contact_person);
$db->bind("warehouse_contact_person_no", $warehouse_contact_person_no);
$db->bind("warehouse_id", $warehouse_id);
$db->bind("delivery_name", $delivery_name);
$db->bind("delivery_address", $delivery_address);
$db->bind("delivery_zip", $delivery_zip);
$db->bind("delivery_city", $delivery_city);
$db->bind("delivery_state", $delivery_state);
$db->bind("delivery_country", $delivery_country);
$db->bind("delivery_contact_person", $delivery_contact_person);
$db->bind("delivery_contact_person_no", $delivery_contact_person_no);
$db->bind("delivery_id", $delivery_id);
$db->bind("company_id", $company_id);
$db->bind("branch_id", $branch_id);
$soCreate = $db->query("INSERT INTO shipping_orders ( marking_no, supplier_company_name, supplier_contact_person, supplier_contact_person_no, warehouse_name, warehouse_address, warehouse_city, warehouse_zip, warehouse_state, warehouse_country, warehouse_contact_person, warehouse_contact_person_no, delivery_name, delivery_address, delivery_city, delivery_zip, delivery_state, delivery_country,delivery_contact_person,delivery_contact_person_no, branch_id, warehouse_id, delivery_id, company_id, forwarder_id) VALUES (:marking_no, :supplier_company_name, :supplier_contact_person, :supplier_contact_person_no, :warehouse_name, :warehouse_address, :warehouse_city, :warehouse_zip, :warehouse_state, :warehouse_country, :warehouse_contact_person, :warehouse_contact_person_no, :delivery_name, :delivery_address, :delivery_city, :delivery_zip, :delivery_state, :delivery_country, :delivery_contact_person, :delivery_contact_person_no, :branch_id, :warehouse_id, :delivery_id, :company_id, :forwarder_id);");
$so_id = $db->lastInsertId();
if ($soCreate) {
if($order_type == "1"){
$ordercountCreate = $db->query("INSERT INTO order_count (id) VALUES (NULL);");
$order_no = sprintf('%05d', $db->lastInsertId());
$marking = getMarkingNo($company_id, $forwarder_id, $branch_id);
$marking_no = getMarkingNo($company_id, $forwarder_id, $branch_id). "/" .$order_no;
$ordercountCreate = $db->query("INSERT INTO order_count (id) VALUES (NULL);");
$order_no = sprintf('%05d', $db->lastInsertId());
$marking = getMarkingNo($company_id, $forwarder_id, $branch_id);
$marking_no = getMarkingNo($company_id, $forwarder_id, $branch_id). "/" .$order_no;
$db->bind("order_no", $order_no);
$db->bind("marking", $marking);
$db->bind("marking_no", $marking_no);
$db->bind("so_id", $so_id);
$soUpdate = $db->query("UPDATE `shipping_orders` SET `marking_no`=:marking_no, `marking`=:marking, `order_no` = :order_no WHERE so_id = :so_id");
}else{
$marking_no = getPOData($po_id, "marking_no");
$order_no = getPOData($po_id, "order_no");
$marking = getPOData($po_id, "marking");
$db->bind("order_no", $order_no);
$db->bind("marking", $marking);
$db->bind("marking_no", $marking_no);
$db->bind("so_id", $so_id);
$soUpdate = $db->query("UPDATE `shipping_orders` SET `marking_no`=:marking_no, `marking`=:marking, `order_no` = :order_no WHERE so_id = :so_id");
}
$db->bind("order_no", $order_no);
$db->bind("marking", $marking);
$db->bind("marking_no", $marking_no);
$db->bind("so_id", $so_id);
$soUpdate = $db->query("UPDATE `shipping_orders` SET `marking_no`=:marking_no, `marking`=:marking, `order_no` = :order_no WHERE so_id = :so_id");
foreach ($shippingorderitems as $key => $shippingorderitem) {
@@ -449,95 +330,69 @@ function the_so(){
$db->bind("packaging_depth", $shippingorderitem['packaging_depth']);
$db->bind("packaging_gross", $shippingorderitem['packaging_gross']);
$db->bind("packaging_nett", $shippingorderitem['packaging_nett']);
$db->bind("po_item_id", $shippingorderitem['po_item_id']);
$db->bind("image", $shippingorderitem['image']);
$db->bind("image2", $shippingorderitem['image2']);
$db->bind("image3", $shippingorderitem['image3']);
$db->bind("image4", $shippingorderitem['image4']);
$db->bind("image", ($shippingorderitem['image'] <> "" ? $shippingorderitem['image'] : NULL));
$db->bind("image2", ($shippingorderitem['image2'] <> "" ? $shippingorderitem['image2'] : NULL));
$db->bind("image3", ($shippingorderitem['image3'] <> "" ? $shippingorderitem['image3'] : NULL));
$db->bind("image4", ($shippingorderitem['image4'] <> "" ? $shippingorderitem['image4'] : NULL));
$db->bind("so_id", $so_id);
$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, po_item_id, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :po_item_id, :image, :image2, :image3, :image4, :so_id);");
$soItemCreate = $db->query("INSERT INTO shipping_order_items ( item_code, model_no, brand_no, description, quantity, uom, packaging_quantity, packaging_type, packaging_cbm, packaging_height, packaging_width, packaging_depth, packaging_gross, packaging_nett, image, image2, image3, image4, so_id) VALUES (:item_code, :model_no, :brand_no, :description, :quantity, :uom, :packaging_quantity, :packaging_type, :packaging_cbm, :packaging_height, :packaging_width, :packaging_depth, :packaging_gross, :packaging_nett, :image, :image2, :image3, :image4, :so_id);");
}
}
if ($soItemCreate) {
$chat_name = $order_no;
if($order_type == "1"){
//create messages
$db->bind("message", "Your shipping order have been created.");
$db->bind("chat_type", "6");
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//create room for user_id
$db->bind("chat_name",$chat_name);
$db->bind("owner_id", $user_id);
$db->bind("order_id", $so_id);
$db->bind("room_type", "order");
$createRoom = $db->query("INSERT INTO notice_rooms(chat_name,owner_id,order_id,room_type) VALUES ( :chat_name, :owner_id, :order_id, :room_type)");
$room_id = $db->lastInsertId();
//create members for room (current user)
$db->bind("user_id", $user_id);
//create messages
$db->bind("message", "Your shipping order have been created.");
$db->bind("chat_type", "6");
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//create room for user_id
$db->bind("chat_name",$chat_name);
$db->bind("owner_id", $user_id);
$db->bind("order_id", $so_id);
$db->bind("room_type", "order");
$createRoom = $db->query("INSERT INTO notice_rooms(chat_name,owner_id,order_id,room_type) VALUES ( :chat_name, :owner_id, :order_id, :room_type)");
$room_id = $db->lastInsertId();
//create members for room (current user)
$db->bind("user_id", $user_id);
$db->bind("room_id", $room_id);
$createMembers = $db->query("INSERT INTO notice_members(room_id,user_id,status) VALUES (:room_id, :user_id, 1)");
//create unread notification
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $user_id);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
$db->bind("forwarder_id", $forwarder_id);
$companyStaffs = $db->query("SELECT * FROM user_company WHERE company_id = :forwarder_id and position = 1");
foreach($companyStaffs as $key => $value){
$db->bind("user_id", $value['user_id']);
$db->bind("room_id", $room_id);
$createMembers = $db->query("INSERT INTO notice_members(room_id,user_id,status) VALUES (:room_id, :user_id, 1)");
//create unread notification
//create unread notification for admin staffs
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $user_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
$db->bind("forwarder_id", $forwarder_id);
$companyStaffs = $db->query("SELECT * FROM user_company WHERE company_id = :forwarder_id and position = 1");
foreach($companyStaffs as $key => $value){
$db->bind("user_id", $value['user_id']);
$db->bind("room_id", $room_id);
$createMembers = $db->query("INSERT INTO notice_members(room_id,user_id,status) VALUES (:room_id, :user_id, 1)");
//create unread notification for admin staffs
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
}else{
//create messages
$db->bind("message", "Your shipping order have been created.");
$db->bind("chat_type", "6");
$db->bind("from_id", $user_id);
$createMessage = $db->query("INSERT INTO notice_messages(message,chat_type,from_id) VALUES (:message,:chat_type,:from_id)");
$message_id = $db->lastInsertId();
//get room from po_id
$room_id = getRoomIDFromPO($po_id);
$db->bind("order_id", $so_id);
$db->bind("room_id", $room_id);
$createMessage = $db->query("UPDATE `notice_rooms` SET `order_id` = :order_id WHERE `notice_rooms`.`room_id` = :room_id");
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
//create unread notification
$MembersInRoom = getUserInRoom($room_id);
foreach ($MembersInRoom as $key => $value){
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$db->bind("user_id", $value['user_id']);
$createMembers = $db->query("INSERT INTO notice_unread(room_id,message_id,user_id, status) VALUES (:room_id, :message_id,:user_id, 0)");
}
$db->bind("user_id", $value['user_id']);
$db->bind("so_id", $so_id);
$createSOUnread = $db->query("INSERT INTO shipping_order_unread(user_id,so_id) VALUES (:user_id,:so_id)");
}
//connecting messages with room
$db->bind("room_id", $room_id);
$db->bind("message_id", $message_id);
$createMembers = $db->query("INSERT INTO notice_room_message(room_id,message_id) VALUES (:room_id, :message_id)");
return new Response($so_id, 200);
} else {
return new Response($so_id, 201);
modul/orders/shipping-order/so.func.php
+9
View File
@@ -1,5 +1,14 @@
<?php
function getSOUnreadBySOID($so_id){
global $db;
$db->bind('so_id', $so_id);
$db->bind('user_id', $_SESSION['user_id']);
$data = $db->query("SELECT * FROM shipping_order_unread WHERE so_id = :so_id and user_id = :user_id");
return $data[0]['status'];
}
function getAllPOWithoutSO(){
global $db;
modul/orders/shipping-order/so.list.php
+3 -1
View File
@@ -40,7 +40,7 @@ foreach ($data as $key => $value) {
$nestedData = array();
$nestedData[] = $value["so_id"];
$nestedData[] = $value["order_no"];
$nestedData[] = $value["order_no"] . (getSOUnreadBySOID($value["so_id"]) == 0 ? " <span class='badge badge-danger'> new </span>" : "");
$nestedData[] = $value["marking"];
$nestedData[] = date('d-m-Y', strtotime($value["created_on"]));
$nestedData[] = $value["supplier_company_name"]. "<br>". $value["supplier_contact_person"]. "<br>". $value["supplier_contact_person_no"];
@@ -74,6 +74,8 @@ foreach ($data as $key => $value) {
$qweqwe[] = $nestedData;
}
$db->query("UPDATE shipping_order_unread set status = 1 where user_id = '". $_SESSION['user_id'] ."'");
$json_data = array(
"draw" => intval( $requestData['draw'] ), // for every request/draw by clientside , they send a number as a parameter, when they recieve a response/data they first check the draw number, so we are sending same number in draw.
"recordsTotal" => intval( $totalData ), // total number of records