git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check delivery nil for order reservation

Browse Source
This commit is contained in:
Aung Kyaw Phyoe
2019-01-10 16:03:46 +06:30
parent b72dbdaad4
commit 121e584009
1 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/origami/order_reservation/index.html.erb
View File

@@ -72,7 +72,7 @@
<tbody> <tbody>
<% i=1 <% i=1
@order.each do |order| %> @order.each do |order| %>
<% if order.status == 'new' %> <% if order.status == 'new' && !order.delivery.nil? %>
<tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>"> <tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left"> <td width ="5%" class="align-left">
<%=i%> <%=i%>
@@ -95,6 +95,7 @@
</td> </td>
<td width ="20%" class="align-center"> <td width ="20%" class="align-center">
<span class="font-10 col-blue"> <span class="font-10 col-blue">
<% if !order.delivery.nil? %>
<% if order.delivery.delivery_type == 'service' %> <% if order.delivery.delivery_type == 'service' %>
DELIVERY DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %> <% elsif order.delivery.delivery_type == 'pick_up' %>
@@ -104,6 +105,7 @@
<% else %> <% else %>
DIRECT DELIVERY DIRECT DELIVERY
<% end %> <% end %>
<% end %>
</span> </span>
</td> </td>
</tr> </tr>
@@ -124,7 +126,7 @@
<tbody> <tbody>
<% i=1 <% i=1
@order.each do |order| %> @order.each do |order| %>
<% if order.status == 'accepted' %> <% if order.status == 'accepted' && !order.delivery.nil? %>
<tr class="custom-tr second-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>"> <tr class="custom-tr second-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left"> <td width ="5%" class="align-left">
<%=i%> <%=i%>
@@ -147,6 +149,7 @@
</td> </td>
<td width ="20%" class="align-center"> <td width ="20%" class="align-center">
<span class="font-10 col-blue"> <span class="font-10 col-blue">
<% if !order.delivery.nil? %>
<% if order.delivery.delivery_type == 'service' %> <% if order.delivery.delivery_type == 'service' %>
DELIVERY DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %> <% elsif order.delivery.delivery_type == 'pick_up' %>
@@ -156,6 +159,7 @@
<% else %> <% else %>
DIRECT DELIVERY DIRECT DELIVERY
<% end %> <% end %>
<% end %>
</span> </span>
</td> </td>
</tr> </tr>
@@ -175,7 +179,7 @@
<tbody> <tbody>
<% i=1 <% i=1
@order.each do |order| %> @order.each do |order| %>
<% if order.status == 'send_to_kitchen' %> <% if order.status == 'send_to_kitchen' && !order.delivery.nil? %>
<tr class="custom-tr third-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>"> <tr class="custom-tr third-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left"> <td width ="5%" class="align-left">
<%=i%> <%=i%>
@@ -198,6 +202,7 @@
</td> </td>
<td width ="20%" class="align-center"> <td width ="20%" class="align-center">
<span class="font-10 col-blue"> <span class="font-10 col-blue">
<% if !order.delivery.nil? %>
<% if order.delivery.delivery_type == 'service' %> <% if order.delivery.delivery_type == 'service' %>
DELIVERY DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %> <% elsif order.delivery.delivery_type == 'pick_up' %>
@@ -207,6 +212,7 @@
<% else %> <% else %>
DIRECT DELIVERY DIRECT DELIVERY
<% end %> <% end %>
<% end %>
</span> </span>
</td> </td>
</tr> </tr>
@@ -226,7 +232,7 @@
<tbody> <tbody>
<% i=1 <% i=1
@order.each do |order| %> @order.each do |order| %>
<% if order.status == 'ready_to_delivery' %> <% if order.status == 'ready_to_delivery' && !order.delivery.nil? %>
<tr class="custom-tr fourth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>"> <tr class="custom-tr fourth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left"> <td width ="5%" class="align-left">
<%=i%> <%=i%>
@@ -249,6 +255,7 @@
</td> </td>
<td width ="20%" class="align-center"> <td width ="20%" class="align-center">
<span class="font-10 col-blue"> <span class="font-10 col-blue">
<% if !order.delivery.nil? %>
<% if order.delivery.delivery_type == 'service' %> <% if order.delivery.delivery_type == 'service' %>
DELIVERY DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %> <% elsif order.delivery.delivery_type == 'pick_up' %>
@@ -258,6 +265,7 @@
<% else %> <% else %>
DIRECT DELIVERY DIRECT DELIVERY
<% end %> <% end %>
<% end %>
</span> </span>
</td> </td>
</tr> </tr>
@@ -277,7 +285,7 @@
<tbody> <tbody>
<% i=1 <% i=1
@order.each do |order| %> @order.each do |order| %>
<% if order.status == 'delivered' && (order.created_at.utc.getlocal.strftime("%Y-%m-%d") == DateTime.now.strftime("%Y-%m-%d")) %> <% if order.status == 'delivered' && (order.created_at.utc.getlocal.strftime("%Y-%m-%d") == DateTime.now.strftime("%Y-%m-%d")) && !order.delivery.nil? %>
<tr class="custom-tr fifth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>"> <tr class="custom-tr fifth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left"> <td width ="5%" class="align-left">
<%=i%> <%=i%>
@@ -300,6 +308,7 @@
</td> </td>
<td width ="20%" class="align-center"> <td width ="20%" class="align-center">
<span class="font-10 col-blue"> <span class="font-10 col-blue">
<% if !order.delivery.nil? %>
<% if order.delivery.delivery_type == 'service' %> <% if order.delivery.delivery_type == 'service' %>
DELIVERY DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %> <% elsif order.delivery.delivery_type == 'pick_up' %>
@@ -309,6 +318,7 @@
<% else %> <% else %>
DIRECT DELIVERY DIRECT DELIVERY
<% end %> <% end %>
<% end %>
</span> </span>
</td> </td>
</tr> </tr>