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

update lookup

Browse Source
This commit is contained in:
Aung Myo
2017-07-31 17:33:06 +06:30
parent bc5a7d01f7
commit b3c77fc28c
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/crm/customers_controller.rb
View File

@@ -96,7 +96,8 @@ class Crm::CustomersController < BaseCrmController
merchant_uid:merchant_uid,auth_token:auth_token}.to_json merchant_uid:merchant_uid,auth_token:auth_token}.to_json
# Check for paypar account exists # Check for paypar account exists
if paypar_account_no != nil || paypar_account_no != '' # if paypar_account_no != nil || paypar_account_no != ''
if paypar_account_no.present?
member_params = { name: name,phone: phone,email: email, member_params = { name: name,phone: phone,email: email,
dob: dob,address: address,nrc:nrc,card_no:card_no, dob: dob,address: address,nrc:nrc,card_no:card_no,
paypar_account_no: paypar_account_no, paypar_account_no: paypar_account_no,
@@ -150,7 +151,12 @@ class Crm::CustomersController < BaseCrmController
# When paypar account no not exist in paypar # When paypar account no not exist in paypar
if response["message"] == "Account has not exist." if response["message"] == "Account has not exist."
customer.destroy customer.destroy
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]} if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer cannot created.' + response["message"]}
else
format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] }
end
end end
if params[:sale_id] if params[:sale_id]

10
app/controllers/settings/lookups_controller.rb
View File

@@ -28,11 +28,11 @@ class Settings::LookupsController < ApplicationController
respond_to do |format| respond_to do |format|
if @settings_lookup.save if @settings_lookup.save
format.html { redirect_to @settings_lookup, notice: 'Lookup was successfully created.' } format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully created.' }
format.json { render :show, status: :created, location: @settings_lookup } format.json { render :show, status: :created, location: @settings_lookup }
else else
format.html { render :new } format.html { render :new }
format.json { render json: @settings_lookup.errors, status: :unprocessable_entity } format.json { render json: settings_lookups_path.errors, status: :unprocessable_entity }
end end
end end
end end
@@ -42,11 +42,11 @@ class Settings::LookupsController < ApplicationController
def update def update
respond_to do |format| respond_to do |format|
if @settings_lookup.update(settings_lookup_params) if @settings_lookup.update(settings_lookup_params)
format.html { redirect_to @settings_lookup, notice: 'Lookup was successfully updated.' } format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_lookup } format.json { render :show, status: :ok, location: @settings_lookup }
else else
format.html { render :edit } format.html { render :edit }
format.json { render json: @settings_lookup.errors, status: :unprocessable_entity } format.json { render json: settings_lookups_path.errors, status: :unprocessable_entity }
end end
end end
end end
@@ -56,7 +56,7 @@ class Settings::LookupsController < ApplicationController
def destroy def destroy
@settings_lookup.destroy @settings_lookup.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to settings_lookups_url, notice: 'Lookup was successfully destroyed.' } format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully destroyed.' }
format.json { head :no_content } format.json { head :no_content }
end end
end end

3
app/models/sale_payment.rb
View File

@@ -400,10 +400,8 @@ class SalePayment < ApplicationRecord
rebate_arr =[] rebate_arr =[]
campaign_method.each do |a| campaign_method.each do |a|
data = {:type => a[:type], :amount => a[:amount]} data = {:type => a[:type], :amount => a[:amount]}
puts data
type_arr.each do |si| type_arr.each do |si|
if si[:type] == a[:type] if si[:type] == a[:type]
puts "steeeeeeeeeeeee"
amount = (redeem_amount / total_percentage)*si[:percentage] amount = (redeem_amount / total_percentage)*si[:percentage]
actual = a[:amount] - amount actual = a[:amount] - amount
data[:amount] = actual data[:amount] = actual
@@ -454,7 +452,6 @@ class SalePayment < ApplicationRecord
response = { "status": false, "message": "Can't connect server"} response = { "status": false, "message": "Can't connect server"}
end end
return response return response
end end
else else
response = { "status": "no_member", "message": "Not membership"} response = { "status": "no_member", "message": "Not membership"}

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

@@ -1,4 +1,4 @@
<%= simple_form_for(@settings_lookup) do |f| %> <%= simple_form_for([:settings,@settings_lookup]) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs">

2
app/views/settings/lookups/edit.html.erb
View File

@@ -2,5 +2,5 @@
<%= render 'form', settings_lookup: @settings_lookup %> <%= render 'form', settings_lookup: @settings_lookup %>
<%= link_to 'Show', @settings_lookup %> | <%= link_to 'Show', settings_lookup_path(@settings_lookup) %> |
<%= link_to 'Back', settings_lookups_path %> <%= link_to 'Back', settings_lookups_path %>

25
app/views/settings/lookups/index.html.erb
View File

@@ -1,14 +1,23 @@
<p id="notice"><%= notice %></p>
<h1>Settings Lookups</h1> <div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Account</li>
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_lookup_path,:class => 'btn btn-primary btn-sm' %>
</span>
</ul>
</div>
<table> <br>
<thead> <div class="card">
<table class="table table-striped">
<thead>
<tr> <tr>
<th>Lookup type</th> <th>Lookup type</th>
<th>Name</th> <th>Name</th>
<th>Value</th> <th>Value</th>
<th colspan="3"></th> <th colspan="">Action</th>
</tr> </tr>
</thead> </thead>
@@ -24,8 +33,6 @@
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div>
<br>
<%= link_to 'New Settings Lookup', new_settings_lookup_path %>