Merge branch 'master' into development

resources/views/detail/content.blade.php

@@ -20,8 +20,8 @@
             $action_name = explode('@', $route)[1];
             $action_name = explode('@', $route)[1];
         ?>
         ?>
         <input type="hidden" class="action_type" value="{{$action_name}}">
         <input type="hidden" class="action_type" value="{{$action_name}}">
-        <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
-        <input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
+        <input type="hidden" id="order_id" name="order_id" value="{{$order_info['order_id']}}">
+        <input type="hidden" id="user_id" name="user_id" value="{{$order_info['user_id']}}">
 
 
         <div class="tabs-box table-responsive">
         <div class="tabs-box table-responsive">
             <table class="table table-bordered order-express">
             <table class="table table-bordered order-express">