Merge branch 'develop'

src/main/resources/templates/mail/risk_upload_mail.html

@@ -198,12 +198,14 @@
         </tbody>
     </table>
     <p th:if="${description != null}"><span th:text="${description}"></span></p>
-    <p>Chargeback将会扣除$40作为Chargeback Fee，同时扣除对应订单交易额，申诉成功后将返还订单交易额，还请及时提交材料。<!--还请按时提供商户材料并直接回复该邮件， --> 感谢，辛苦。</p>
+    <p><strong>Chargeback将会扣除$40作为Chargeback Fee，同时扣除对应订单交易额，申诉成功后将返还订单交易额，还请及时提交材料。</strong><!--还请按时提供商户材料并直接回复该邮件， -->
+        感谢，辛苦。</p>
     <!--<p>请点击此链接上传所需材料<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a></p>-->
     <p th:if="${is_send_client==1}">材料请通过APP在规定时间内进行上传，或请联系BD，由BD在后台进行上传。</p>
     <p>
-        Chargeback issue will take $40 for chargeback fee and minus the fee of the transaction. If you win the
+        <strong>Chargeback issue will take $40 for chargeback fee and minus the fee of the transaction. If you win the
-        chargeback. Transaction amount will be returned to your account. Please be sure to assist the investigation.
+            chargeback. Transaction amount will be returned to your account. Please be sure to assist the
+            investigation.</strong>
         Thanks.
     </p>
     <p th:if="${is_send_client==1}">

src/main/ui/static/commons/templates/order_detail.html

@@ -180,11 +180,18 @@
                         <p><label class="control-label" style="cursor: pointer">Payer Card Information</label></p>
                     </div>
                     <div ng-if="showPayerCardInfo">
-                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Bank:   </label> {{order.card_bank}}</p>
+                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Bank: </label>
-                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Type:   </label> {{order.card_type}}</p>
+                            {{order.card_bank}}</p>
-                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Alias:  </label> {{order.card_alias}}</p>
+                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Type: </label>
-                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Scheme: </label> {{order.card_scheme}}</p>
+                            {{order.card_type}}</p>
-                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Country:</label> {{order.card_country}}</p>
+                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Alias: </label>
+                            {{order.card_alias}}</p>
+                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Scheme: </label>
+                            {{order.card_scheme}}</p>
+                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Card Country:</label>
+                            {{order.card_country}}</p>
+                        <p class="tradeCardInfo"><label style="padding-right: 20%;">Enabled 3-DS:</label>
+                            {{order.threeds_flag ? 'YES' : 'NO'}}</p>
                     </div>
                 </div>
                 <!--<div class="form-group">-->

src/main/ui/static/css/annualBill/annual_bill.css

@@ -426,7 +426,7 @@ img{
 }
 
 
-@-webkit-@keyframes move {
+@-webkit-keyframes move {
 	0% {
 		bottom: 10px;
 	}