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

add new delivery type for turbo

Browse Source
This commit is contained in:
phyusin
2018-08-30 17:04:32 +06:30
parent fef6a4ccd0
commit 78da662a57
9 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,6 +98,8 @@
DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %>
PICK-UP
<% elsif order.delivery.delivery_type == 'turbo' %>
TURBO
<% else %>
DIRECT DELIVERY
<% end %>
@@ -148,6 +150,8 @@
DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %>
PICK-UP
<% elsif order.delivery.delivery_type == 'turbo' %>
TURBO
<% else %>
DIRECT DELIVERY
<% end %>
@@ -197,6 +201,8 @@
DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %>
PICK-UP
<% elsif order.delivery.delivery_type == 'turbo' %>
TURBO
<% else %>
DIRECT DELIVERY
<% end %>
@@ -246,6 +252,8 @@
DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %>
PICK-UP
<% elsif order.delivery.delivery_type == 'turbo' %>
TURBO
<% else %>
DIRECT DELIVERY
<% end %>
@@ -295,6 +303,8 @@
DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %>
PICK-UP
<% elsif order.delivery.delivery_type == 'turbo' %>
TURBO
<% else %>
DIRECT DELIVERY
<% end %>

2
app/views/reports/order_reservation/index.html.erb
View File

@@ -125,6 +125,8 @@
provider = "Pick-Up"
elsif order_reservation.provider == 'direct_delivery'
provider = "Direct Delivery"
elsif order_reservation.provider == 'turbo'
provider = "TURBO"
else
provider = order_reservation.provider
end

2
app/views/reports/order_reservation/index.xls.erb
View File

@@ -101,6 +101,8 @@
provider = "Pick-Up"
elsif order_reservation.provider == 'direct_delivery'
provider = "Direct Delivery"
elsif order_reservation.provider == 'turbo'
provider = "TURBO"
else
provider = order_reservation.provider
end

4
app/views/reports/payment_method/index.html.erb
View File

@@ -96,11 +96,11 @@
<thead>
<%if @payment_type.present?%>
<tr>
<td colspan="6"><strong><%=@payment_type.upcase%> Payment Details</strong></td>
<td colspan="7"><strong><%=@payment_type.upcase%> Payment Details</strong></td>
</tr>
<%else%>
<tr>
<td colspan="6"><strong>All Payment Details</strong></td>
<td colspan="7"><strong>All Payment Details</strong></td>
</tr>
<%end%>

4
app/views/reports/payment_method/index.xls.erb
View File

@@ -83,11 +83,11 @@
<thead>
<%if @payment_type.present?%>
<tr>
<td colspan="6"><strong><%=@payment_type.upcase%> Payment Details</strong></td>
<td colspan="7"><strong><%=@payment_type.upcase%> Payment Details</strong></td>
</tr>
<%else%>
<tr>
<td colspan="6"><strong>All Payment Details</strong></td>
<td colspan="7"><strong>All Payment Details</strong></td>
</tr>
<%end%>

2
app/views/transactions/order_reservations/index.html.erb
View File

@@ -134,6 +134,8 @@
provider = "Pick-Up"
elsif order_reservation.provider == 'direct_delivery'
provider = "Direct Delivery"
elsif order_reservation.provider == 'turbo'
provider = "TURBO"
else
provider = order_reservation.provider
end