From 0f7238bbbaab224514c8e50cb99a1801179d1549 Mon Sep 17 00:00:00 2001
From: Peng DU <peng@sleede.com>
Date: Fri, 23 Sep 2016 11:46:58 +0200
Subject: [PATCH 1/2] fix wallet amount display error

---
 app/assets/templates/shared/_wallet_amount_info.html.erb | 8 ++++----
 app/assets/templates/stripe/payment_modal.html.erb       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/templates/shared/_wallet_amount_info.html.erb b/app/assets/templates/shared/_wallet_amount_info.html.erb
index 2eeb7b4e9..84c2d0bd5 100644
--- a/app/assets/templates/shared/_wallet_amount_info.html.erb
+++ b/app/assets/templates/shared/_wallet_amount_info.html.erb
@@ -1,10 +1,10 @@
 <div ng-if="currentUser.role != 'admin'">
-  <h3 class="m-t-xs" ng-if="walletAmount > 0 && price > 0">{{ 'you_have_amount_in_wallet' | translate:{ amount: numberFilter(walletAmount, 2), currency: currencySymbol } }}</h3>
+  <h3 class="m-t-xs" ng-if="walletAmount > 0 && price > 0" ng-bind-html="'you_have_amount_in_wallet' | translate:{ amount: numberFilter(walletAmount, 2), currency: currencySymbol }"></h3>
   <p ng-if="walletAmount > 0 && price > 0 && amount === 0" class="text-italic">{{'wallet_pay_reservation' | translate}}</p>
-  <p ng-if="walletAmount > 0 && amount !== 0" class="text-italic">{{'credit_amount_for_pay_reservation' | translate:{ amount: numberFilter(amount, 2), currency: currencySymbol } }}</p>
+  <p ng-if="walletAmount > 0 && amount !== 0" class="text-italic" ng-bind-html="'credit_amount_for_pay_reservation' | translate:{ amount: numberFilter(amount, 2), currency: currencySymbol }"></p>
 </div>
 <div ng-if="currentUser.role == 'admin'">
-  <h3 class="m-t-xs" ng-if="walletAmount > 0 && price > 0">{{ 'client_have_amount_in_wallet' | translate:{ amount: numberFilter(walletAmount, 2), currency: currencySymbol } }}</h3>
+  <h3 class="m-t-xs" ng-if="walletAmount > 0 && price > 0" ng-bind-html="'client_have_amount_in_wallet' | translate:{ amount: numberFilter(walletAmount, 2), currency: currencySymbol }"></h3>
   <p ng-if="walletAmount > 0 && price > 0 && amount === 0" class="text-italic">{{'client_wallet_pay_reservation' | translate}}</p>
-  <p ng-if="walletAmount > 0 && amount !== 0" class="text-italic">{{'client_credit_amount_for_pay_reservation' | translate:{ amount: numberFilter(amount, 2), currency: currencySymbol } }}</p>
+  <p ng-if="walletAmount > 0 && amount !== 0" class="text-italic" ng-bind-html="'client_credit_amount_for_pay_reservation' | translate:{ amount: numberFilter(amount, 2), currency: currencySymbol }"></p>
 </div>
diff --git a/app/assets/templates/stripe/payment_modal.html.erb b/app/assets/templates/stripe/payment_modal.html.erb
index 5c0aa11a9..20bebea04 100644
--- a/app/assets/templates/stripe/payment_modal.html.erb
+++ b/app/assets/templates/stripe/payment_modal.html.erb
@@ -10,8 +10,8 @@
       <form name="stripeForm" stripe:form="payment" class="form-horizontal">
         <div class="panel-body">
 
-          <h3 class="m-t-xs" ng-if="walletAmount">{{ 'you_have_amount_in_wallet' | translate:{ amount: numberFilter(walletAmount, 2), currency: currencySymbol } }}</h3>
-          <p ng-if="walletAmount > 0 && amount !== 0" class="text-italic">{{'credit_amount_for_pay_reservation' | translate:{ amount: numberFilter(amount, 2), currency: currencySymbol } }}</p>
+          <h3 class="m-t-xs" ng-if="walletAmount" ng-bind-html="'you_have_amount_in_wallet' | translate:{ amount: numberFilter(walletAmount, 2), currency: currencySymbol }"></h3>
+          <p ng-if="walletAmount > 0 && amount !== 0" class="text-italic" ng-bind-html="'credit_amount_for_pay_reservation' | translate:{ amount: numberFilter(amount, 2), currency: currencySymbol }"></p>
 
           <div class="form-group" ng-class="{'has-error': stripeForm.number.$dirty && stripeForm.number.$invalid}">
             <div class="col-sm-12">

From fc9aeb00a2ea20e98db28eb32f4609b381cbbf8a Mon Sep 17 00:00:00 2001
From: Peng DU <peng@sleede.com>
Date: Fri, 23 Sep 2016 12:52:43 +0200
Subject: [PATCH 2/2] remove edit wallet reference from facture

---
 app/assets/templates/admin/invoices/index.html.erb | 2 +-
 app/models/invoice.rb                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb
index 6ba4bda8a..c4e47ff7d 100644
--- a/app/assets/templates/admin/invoices/index.html.erb
+++ b/app/assets/templates/admin/invoices/index.html.erb
@@ -210,7 +210,7 @@
                   <li ng-click="invoice.reference.help = 'addDay.html'">{{ 'day' | translate }}</li>
                   <li ng-click="invoice.reference.help = 'addInvoiceNumber.html'">{{ '#_of_invoice' | translate }}</li>
                   <li ng-click="invoice.reference.help = 'addOnlineInfo.html'">{{ 'online_sales' | translate }}</li>
-                  <li ng-click="invoice.reference.help = 'addWalletInfo.html'">{{ 'wallet' | translate }}</li>
+                  <%# <li ng-click="invoice.reference.help = 'addWalletInfo.html'">{{ 'wallet' | translate }}</li> %>
                   <li ng-click="invoice.reference.help = 'addRefundInfo.html'">{{ 'refund' | translate }}</li>
               </ul>
           </div>
diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index 6eb2e7bec..5970283df 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -69,7 +69,7 @@ class Invoice < ActiveRecord::Base
     end
 
     # information about wallet (W[text])
-    reference.gsub!(/W\[([^\]]+)\]/, ''.to_s)
+    #reference.gsub!(/W\[([^\]]+)\]/, ''.to_s)
 
     # remove information about refunds (R[text])
     reference.gsub!(/R\[([^\]]+)\]/, ''.to_s)