Commit ceb6da1c authored by Jasa Digital's avatar Jasa Digital

perbaikan untuk history order

parent c9417de6
...@@ -195,8 +195,10 @@ class Api { ...@@ -195,8 +195,10 @@ class Api {
} }
if (jsonObject['data']['type_order'] == typeOrderDelivery) { if (jsonObject['data']['type_order'] == typeOrderDelivery) {
setIsCustomerDelivery(true); setIsCustomerDelivery(true);
} else { } else if (jsonObject['data']['type_order'] == typeOrderPickup) {
setIsCustomerDelivery(false); setIsCustomerDelivery(false);
} else {
setIsDeliveryPickup(false);
} }
setIsNewOrder(false); setIsNewOrder(false);
return responseByodBranchExist; return responseByodBranchExist;
...@@ -1019,10 +1021,13 @@ class Api { ...@@ -1019,10 +1021,13 @@ class Api {
"rdm_staff_courier_mobile": "rdm_staff_courier_mobile":
jsonObject['data']['rdm_staff_courier_mobile'] ?? "", jsonObject['data']['rdm_staff_courier_mobile'] ?? "",
}; };
if (jsonObject['data']['type'] == typeOrderDelivery) { if (jsonObject['data']['type'] == typeOrderDelivery) {
setIsCustomerDelivery(true); setIsCustomerDelivery(true);
} else { } else if (jsonObject['data']['type'] == typeOrderPickup) {
setIsCustomerDelivery(false); setIsCustomerDelivery(false);
} else {
setIsDeliveryPickup(false);
} }
bill.add(Bill.createBill(i)); bill.add(Bill.createBill(i));
// billDetail.add(BillDetail.createBillDetail(orderDetail[d])); // billDetail.add(BillDetail.createBillDetail(orderDetail[d]));
......
...@@ -55,7 +55,7 @@ Future<int> runMqTT(BuildContext context) async { ...@@ -55,7 +55,7 @@ Future<int> runMqTT(BuildContext context) async {
} }
if (mqClient.connectionStatus!.state == MqttConnectionState.connected) { if (mqClient.connectionStatus!.state == MqttConnectionState.connected) {
if (debug) { if (debug) {
logd('CHECK CONNECTION', 'CONNECTED'); logd('CHECK CONNECTION', 'CONNECTED AND SUBS $queueTopic');
} }
} else { } else {
/// Use status here rather than state if you also want the broker return code. /// Use status here rather than state if you also want the broker return code.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment