From 41be5a173b61a619f6610d11ba86890815eacd92 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 18 Jul 2019 10:31:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=98=BE=E7=A4=BAclient=20payment=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                       | 19 ++++++++++++++++++-
 .../templates/partner_payment_info.html       | 16 ++++++++--------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 615b152f1..389d60348 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -330,7 +330,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'">
+                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'&& roleNow!='orgmanager'">
                     <p role="button" ng-class="{'active': Transaction,'is-hide':hideSideBar}" ng-click="Transaction = !Transaction">
                         <span>交易管理|Transaction</span>
                         <span class="pull-right-container">
@@ -904,6 +904,23 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
+
+                <li class="menu-group" ng-if="roleNow=='orgmanager'">
+                    <p role="button" ng-class="{'active': OrgManager,'is-hide':hideSideBar}" ng-click="OrgManager = !OrgManager">
+                        <span>机构管理|OrgManager</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':OrgManager}">
+                        <li ui-sref-active="active" ng-if="('1000000000000'|withRole) && roleNow=='orgmanager'">
+                            <a ui-sref="organizations">
+                                <i class="fa fa-users"></i> <span>组织管理|Organizations</span>
+                            </a>
+                        </li>
+
+                    </ul>
+                </li>
             </ul>
 
         </section>
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 3ac68bc59..212398f7f 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -470,7 +470,7 @@
         </div>
     </div>
 </div>
-<div class="panel panel-default">
+<div class="panel panel-default" ng-if="('111'|withRole) || ('retail_surcharge'|withFunc)">
     <div class="panel-heading">Retail In Store Payment(App, WePayLite, Albert)</div>
     <div class="panel-body">
         <div class="form-horizontal">
@@ -496,7 +496,7 @@
     <div class="panel-heading">Refund </div>
     <div class="panel-body">
         <div class="form-horizontal">
-            <div class="form-group" ng-if="'111'|withRole">
+            <div class="form-group" ng-if="'1000000000111'|withRole">
                 <label class="col-sm-2 control-label">Enable Refund</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_refund" bs-switch
@@ -504,7 +504,7 @@
                 </div>
             </div>
 
-            <div class="form-group" ng-if="'1'|withRole">
+            <div class="form-group" ng-if="'1000000000001'|withRole">
                 <label class="col-sm-2 control-label">Enable Pre-authorize Refund</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_pre_refund" bs-switch
@@ -567,18 +567,18 @@
 </div>
 
 
-<div class="panel panel-default">
+<div class="panel panel-default" ng-if="'1000000000111'|withRole">
     <div class="panel-heading">Order Config</div>
     <div class="panel-body">
         <div class="form-horizontal">
-            <div class="form-group" ng-if="'111'|withRole">
+            <div class="form-group" ng-if="'1000000000111'|withRole">
                 <label class="col-sm-2 control-label">Require Customer Information</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.require_custinfo" bs-switch
                            switch-change="toggleRequireCustInfo()">
                 </div>
             </div>
-            <div class="form-group" ng-if="'111'|withRole">
+            <div class="form-group" ng-if="'1000000000111'|withRole">
                 <label class="col-sm-2 control-label">Require Remark</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.require_remark" bs-switch
@@ -590,10 +590,10 @@
 </div>
 
 
-<div class="panel panel-default">
+<div class="panel panel-default" ng-if="'1000000000111'|withRole">
     <div class="panel-heading">Payment Page</div>
     <div class="panel-body">
-        <div class="form-horizontal" ng-if="'111'|withRole">
+        <div class="form-horizontal" ng-if="'1000000000111'|withRole">
             <div class="form-group col-sm-6">
                 <label class="col-sm-4 control-label">Select Version</label>
                 <div class="col-sm-6">