diff --git a/README.md b/README.md index 186c7336..5feb13ee 100755 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Osaka => BITP Auth Token => pZBHXEFbGNj/G => New => V3 + iua0SjUHzRaQw => rj0MJ0XI5GsKZehE => Old => V2 => code2lab => Old diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 26ce197a..5a904000 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -81,7 +81,7 @@ <% @response["data"].each do |transaction| %> <%= transaction["date"]%> - <% if transaction["status"] == 'Rebate' || transaction["status"] == 'Discount'%> + <% if transaction["status"] == 'Rebate' || transaction["status"] == 'Discount' || transaction["status"] == 'Reversal'%> <%= transaction["deposit"] %> <% else %> (<%= transaction["withdraw"] %>) @@ -95,7 +95,11 @@ Balance - <%= @response["data"].first["balance"] %> + <% if @response["data"].first["status"] == 'Reversal'%> + <%= @response["data"].first["balance"] + @response["data"][1]["balance"]%> + <%else%> + <%= @response["data"].first["balance"] %> + <%end%> <%end%> diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index ae9458b6..5fe4a2f5 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -626,6 +626,10 @@