diff --git a/plugins/romanah/gokbakja/components/Order.php b/plugins/romanah/gokbakja/components/Order.php index 08298cf..a88a1db 100644 --- a/plugins/romanah/gokbakja/components/Order.php +++ b/plugins/romanah/gokbakja/components/Order.php @@ -55,6 +55,7 @@ class Order extends ComponentBase $end = Carbon::parse($data["end"])->format('Y-m-d');; $client_id = $data["client_id"]; + $contract_no = $data["contract_no"]; $note = $data["note"]; @@ -62,6 +63,10 @@ class Order extends ComponentBase $orders->where("client_id", $client_id); } + if ($contract_no) { + $orders->where("contract_no", "like", "%" . $contract_no . "%"); + } + if ($note) { $orders->where("note", "like", "%" . $note . "%"); } diff --git a/themes/gokbakja/pages/orders/order-detail.htm b/themes/gokbakja/pages/orders/order-detail.htm index 1950527..8959c9e 100644 --- a/themes/gokbakja/pages/orders/order-detail.htm +++ b/themes/gokbakja/pages/orders/order-detail.htm @@ -172,7 +172,7 @@ function onStart(){ - {% partial "order/item_header" orderId=order.id clientName=order.client.name + {% partial "order/item_header" contract_no=order.contract_no orderId=order.id clientName=order.client.name allAmount=order.order_all_amount allPrice=order.order_all_price all=all %}
diff --git a/themes/gokbakja/pages/orders/order-detaillogistics.htm b/themes/gokbakja/pages/orders/order-detaillogistics.htm index f5e3959..0983d60 100644 --- a/themes/gokbakja/pages/orders/order-detaillogistics.htm +++ b/themes/gokbakja/pages/orders/order-detaillogistics.htm @@ -129,7 +129,7 @@ function onStart(){ {% endif %}
- {% partial "order/item_header" orderId=order.id clientName=order.client.name + {% partial "order/item_header" contract_no=order.contract_no orderId=order.id clientName=order.client.name allAmount=order.order_all_amount allPrice=order.order_all_price all=all %}
diff --git a/themes/gokbakja/pages/orders/order-detailpayment.htm b/themes/gokbakja/pages/orders/order-detailpayment.htm index 16d5b50..452cf53 100644 --- a/themes/gokbakja/pages/orders/order-detailpayment.htm +++ b/themes/gokbakja/pages/orders/order-detailpayment.htm @@ -120,7 +120,7 @@ function onStart(){ {% endif %}
- {% partial "order/item_header" orderId=order.id clientName=order.client.name + {% partial "order/item_header" contract_no=order.contract_no orderId=order.id clientName=order.client.name allAmount=order.order_all_amount allPrice=order.order_all_price all=all %}
diff --git a/themes/gokbakja/pages/orders/report.htm b/themes/gokbakja/pages/orders/report.htm index c456c32..de2e747 100644 --- a/themes/gokbakja/pages/orders/report.htm +++ b/themes/gokbakja/pages/orders/report.htm @@ -54,6 +54,11 @@ function onStart(){
+
+ + +
+
diff --git a/themes/gokbakja/partials/order/item_header.htm b/themes/gokbakja/partials/order/item_header.htm index 3eb2ad8..85c1e6d 100644 --- a/themes/gokbakja/partials/order/item_header.htm +++ b/themes/gokbakja/partials/order/item_header.htm @@ -19,7 +19,7 @@
-
+
- -
+
+