diff --git a/public_html/assets/css/leftside-modal.css b/public_html/assets/css/leftside-modal.css index fd1eba3..6a42d3c 100644 --- a/public_html/assets/css/leftside-modal.css +++ b/public_html/assets/css/leftside-modal.css @@ -102,16 +102,13 @@ /*------------------------------*/ - - - - - .close { - float: right; - font-size: 22.5px; - font-weight: bold; + z-index: 1; + position: absolute; + right: 10px; line-height: 1; + font-size: 75px; + font-weight: bold; color: #ffffff; text-shadow: 0 1px 0 #ffffff; /* opacity: 0.2; */ @@ -214,8 +211,12 @@ button.close { } .modal-header { + display: flex; + align-items: center; + justify-content: space-between; + position: relative; padding: 15px; - border-bottom: 1px solid #e5e5e5 + border-bottom: 1px solid #e5e5e5; } #sidebar-left .modal-header { @@ -228,10 +229,18 @@ button.close { } .modal-title { + flex: none; + width: 300px !important; + text-align: left; + white-space: normal; + word-wrap: break-word; + overflow: visible; margin: 0; - line-height: 1.42857143 + line-height: 1.42857143; + padding-right: 60px; } + .modal-body { position: relative; padding: 20px diff --git a/public_html/assets/css/main.css b/public_html/assets/css/main.css index 64297ca..d8d5f36 100644 --- a/public_html/assets/css/main.css +++ b/public_html/assets/css/main.css @@ -1680,7 +1680,7 @@ table.table-search-report .tb-list th { pointer-events: auto; cursor: pointer; color:var(--color-sub); - font-size: 16px; + font-size: 30px; font-weight: 700; } @@ -1689,14 +1689,52 @@ table.table-search-report .tb-list th { } .point-overlay { - background-color:white; - width:350px; - z-index: 1000; - cursor:default; - pointer-events: auto; - padding:5px; - border-radius: 5px; position: relative; + background-color:white; + padding: 5px; + border-radius: 5px; + width: 350px; + user-select: none; + transform: none !important; + cursor:default; + position: relative; +} + +.address-row { + display: flex; + justify-content: space-between; + align-items: stretch; + padding: 0; + margin: 0; +} + +.address-title { + width: 40%; + padding: 5px 10px; + font-size: 14px; + font-weight: 500; + background-color: var(--color-sub); + color: #fff; + border-right: .5px solid #c9e0d3; + border-left: .5px solid #c9e0d3; + border-bottom: .5px solid #c9e0d3; + display: flex; + align-items: center; +} + +.address-content { + width: 60%; + padding: 5px 10px; + font-size: 14px; + color: #fff; + border-right: .5px solid #c9e0d3; + border-bottom: .5px solid #c9e0d3; + display: flex; + align-items: center; +} + +.address-link { + text-decoration: underline; } #popupMessage { diff --git a/public_html/assets/internal_api.php b/public_html/assets/internal_api.php index 9e95bed..379ce5b 100644 --- a/public_html/assets/internal_api.php +++ b/public_html/assets/internal_api.php @@ -84,7 +84,9 @@ class API extends CONF { IFNULL(DATE_FORMAT(tc.c_lastpickupdate,'%Y-%m-%d'),'') as c_lastpickupdate, IFNULL(DATE_FORMAT(tc.c_lastpaiddate,'%Y-%m-%d'),'') as c_lastpaiddate, IFNULL(tc.c_geolat,'') as lat, - IFNULL(tc.c_geolon,'') as lon + IFNULL(tc.c_geolon,'') as lon, + td.d_ruid, + td.r_note FROM (SELECT c_uid, @@ -110,17 +112,21 @@ class API extends CONF { FROM tbl_customer) tc, (SELECT - d_uid, - d_customeruid, - d_orderdate, - d_quantity, - d_estquantity, - d_ordertype, - d_driveruid, - d_createruid, - d_status + td.d_uid, + td.d_ruid, + tr.r_note, + td.d_customeruid, + td.d_orderdate, + td.d_quantity, + td.d_estquantity, + td.d_ordertype, + td.d_driveruid, + td.d_createruid, + td.d_status FROM - tbl_daily) td + tbl_daily td + LEFT OUTER JOIN tbl_request tr + ON td.d_ruid = tr.r_uid) td WHERE tc.c_uid = td.d_customeruid AND td.d_driveruid = ".(int)$_POST['driver']." @@ -190,6 +196,8 @@ class API extends CONF { "last_pickup_date" => $rstOptionPoint['c_lastpickupdate'], "last_paid_date" => $rstOptionPoint['c_lastpaiddate'], "duid" => $rstOptionPoint['d_uid'], + "druid" => $rstOptionPoint['d_ruid'], + "rnote" => $rstOptionPoint['r_note'], "orderFlag" => $orderFlag ); if(strlen($uidList) > 0){ @@ -943,6 +951,7 @@ class API extends CONF { try { $sqShortInfo = qry("SELECT + c_name, c_paymenttype, c_comment_ri, c_location @@ -984,6 +993,7 @@ class API extends CONF { $result = array( "id" => $_POST['id'], + "name" => $rstShortInfo['c_name'], "payment_type" => $rstShortInfo['c_paymenttype'], "paymentstring" => $d_paystatusSTR, "comment" => $rstShortInfo['c_comment_ri'], diff --git a/public_html/doc/map.php b/public_html/doc/map.php index 589b7d9..3e7a136 100644 --- a/public_html/doc/map.php +++ b/public_html/doc/map.php @@ -404,9 +404,15 @@ function popup(){ - Sludge + Sludge (%) - + +
+ + + +
+ @@ -598,6 +604,10 @@ function popup(){ + + + + @@ -1639,6 +1649,8 @@ function popup(){ lastPickupDate: json.result[i]['last_pickup_date'], lastPaidDate: json.result[i]['last_paid_date'], duid: json.result[i]['duid'], + druid: json.result[i]['druid'], + rnote: json.result[i]['rnote'], orderFlag: json.result[i]['orderFlag'] @@ -1970,7 +1982,7 @@ function popup(){ } function showShortInfo(id){ - + let loadingTxt = 'Loading...'; jQuery("#customerShortInfo .shortinfo-payment-type").text(loadingTxt); jQuery("#customerShortInfo #c_comment_ri,#customerShortInfo #c_location").val(loadingTxt).attr("disabled","disabled"); @@ -1986,6 +1998,7 @@ function popup(){ var rstInqShortInfo = function(json) { jQuery("#customerShortInfo .c_uid").val(json.result['id']); + jQuery("#customerShortInfo .shortinfo-store-name").text(json.result['name']); jQuery("#customerShortInfo .shortinfo-payment-type").text(json.result['payment_type']); jQuery("#customerShortInfo .shortinfo-payment-string").text(json.result['paymentstring']); jQuery("#customerShortInfo #c_comment_ri").val(json.result['comment']).attr("disabled",false); @@ -2126,7 +2139,7 @@ function popup(){ - + @@ -2134,20 +2147,6 @@ function popup(){ ${property.phone} - - - - - -
Restaurant NameName
Payment Type Cheque ${property.rate}
Phone
Address - - ${property.address} - -
Forecast @@ -2167,20 +2166,32 @@ function popup(){
+ +
+
Address
+
+ + ${property.address} + +
+

`; if(`${property.date}` === 'null') { - innerHtml += ``; - innerHtml += ``; + innerHtml += ``; + innerHtml += ``; }else{ - innerHtml += ``; - innerHtml += ``; + innerHtml += ``; + innerHtml += ``; } innerHtml += ` - +
@@ -2205,4 +2216,27 @@ function popup(){ jQuery(".loading-overlay").css("display","none"); } + + + \ No newline at end of file