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

fixed conflic

Browse Source
This commit is contained in:
Aung Myo
2017-10-27 13:25:13 +06:30
parent 188d091884 c8ee056312
commit b4005efa1b
9 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/payment_method_settings/_form.html.erb
View File

@@ -6,7 +6,7 @@
<div class="form-inputs p-l-15">
<%= f.input :payment_method %>
<%= f.input :is_active,:class=> "checkbox" %>
<%= f.input :is_active %>
<%= f.input :gateway_communication_type %>
<%= f.input :gateway_url %>
<%= f.input :auth_token %>

4
app/views/settings/promotions/_form.html.erb
View File

@@ -219,8 +219,8 @@
7) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br>
8) <%= t("views.right_panel.detail.item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %> <br>
9) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.original_product_txt") %> <br>
10) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %>
--------------------------------------------------------------------------------
10) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %> <br>
-------------------------------------------------------------------
<h5>ADD PRODUCT</h5>
1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
2) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %> <br>