add API for order reservation

2018-05-10 12:37:17 +06:30
parent d2ae16177b
commit abbff492e8
8 changed files with 97 additions and 49 deletions
--- a/app/views/origami/order_reservation/get_order.json.jbuilder
+++ b/app/views/origami/order_reservation/get_order.json.jbuilder
@@ -4,7 +4,7 @@ if @order
 						:requested_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
 						:payment_status,:payment_ref,:taxes,:total_amount,:total_tax,
 						:discount_amount,:convenience_charge,:grand_total,:status,:order_remark,
-						:reservation_remark,:sale_id)
+						:remark,:sale_id)
 	@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
 	if @delivery
 	    json.delivery do |json|
--- a/app/views/origami/order_reservation/index.html.erb
+++ b/app/views/origami/order_reservation/index.html.erb
@@ -441,6 +441,11 @@
                     <b id="order_remark"></b>
                  </td>
                </tr>
+                <tr>
+                  <td colspan="2" class="body-td align-left">
+                    <b><i><span id="remark"></span></i></b>
+                  </td>
+                </tr>
              </tbody>
          </table>
        </div>