@@ -162,6 +162,13 @@ public function rejectOrder(Request $request, Order $order, Product $product)
162
162
return redirect ("/order/order_data " );
163
163
}
164
164
165
+ if ($ order ->status_id == 4 ) {
166
+ $ message = "Order status is already succeded by admin " ;
167
+
168
+ myFlasherBuilder (message: $ message , failed: true );
169
+ return redirect ("/order/order_data " );
170
+ }
171
+
165
172
if ($ order ->status_id == 5 ) {
166
173
$ message = "Order status is already canceled by user " ;
167
174
@@ -276,6 +283,13 @@ public function approveOrder(Order $order, Product $product)
276
283
277
284
public function endOrder (Order $ order , Product $ product )
278
285
{
286
+ if ($ order ->status ->order_status == "done " ) {
287
+ $ message = "The order has already succeded by admin! " ;
288
+ myFlasherBuilder (message: $ message , failed: true );
289
+
290
+ return redirect ("/order/order_data " );
291
+ }
292
+
279
293
if ($ order ->status ->order_status != "approve " ) {
280
294
$ message = "Order has not been approved by the admin! " ;
281
295
myFlasherBuilder (message: $ message , failed: true );
@@ -286,7 +300,7 @@ public function endOrder(Order $order, Product $product)
286
300
// change order status
287
301
$ updated_data = [
288
302
"status_id " => 4 ,
289
- "note_id " => $ order -> payment -> payment_method == " COD " ? 1 : 4 ,
303
+ "note_id " => 5 ,
290
304
"is_done " => 1 ,
291
305
"refusal_reason " => null ,
292
306
];
0 commit comments