Merge branch 'ui-dev' of github.com:Laki7877/reachrabbit-client into …

…ui-dev
Laki7877 · Oct 19, 2016 · dc42d80 · dc42d80
2 parents 8ba411c + 54b1e6a
commit dc42d80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/js/controller.js b/app/js/controller.js
@@ -288,7 +288,7 @@ angular.module('reachRabbitApp.controller', ['reachRabbitApp.service'])
 
             $scope.hasPastMessage = function () {
                 if(!$scope.msglist) return false;
-                if($scope.msglist.length == 0) return false;
+                if($scope.msglist.length === 0) return false;
                 return $scope.totalElements > $scope.msglist.length;
             };
 
@@ -638,6 +638,7 @@ angular.module('reachRabbitApp.influencer.controller', ['reachRabbitApp.service'
             $scope.formData.bank = profile.data.influencer.bank;
             $scope.formData.accountNumber = profile.data.influencer.accountNumber;
             $scope.formData.accountName = profile.data.influencer.accountName;
+            $scope.formData.rememberBankDetail = true;
         });
 
         InfluencerAccountService.getWallet().then(function (walletResponse) {
@@ -1861,6 +1862,10 @@ angular.module('reachRabbitApp.portal.controller', ['reachRabbitApp.service'])
                             });
                     } else {
                         if (mediaId == 'facebook') {
+                            if(response.data.pages.length <= 0) {
+                                $scope.alert.danger('คุณต้องมี Facebook Page เพื่อทำการสมัครด้วย Facebook');
+                                return;
+                            }
                             $state.go('influencer-signup-select-page', { authData: response.data, ref: ref });
                         } else {
                             if (response.data.pages[0].count < $scope.minFollower) {

diff --git a/app/view/admin-transaction-detail.html b/app/view/admin-transaction-detail.html
@@ -6,7 +6,7 @@
       <div class="action-btn-for-header with-back-btn">
         <button class="btn btn-primary" ng-if="transaction.status == 'Pending'" ng-click="approve()"><strong>Approve Brand Payment</strong></button>
       </div>
-      <h2>รายละเอียดการสั่งซื้อ / Brand: {{ transaction.brandTransactionDocument.cart.proposals[0].campaign.brand.brandName | truncate: 30}}</h2>
+      <h2>รายละเอียดการสั่งซื้อ / Brand: {{ transaction.brandTransactionDocument[0].cart.proposals[0].campaign.brand.brandName | truncate: 30}}</h2>
     </zone-header>
     <div class="zone-body">
       <div class="container">

diff --git a/app/view/influencer-wallet.html b/app/view/influencer-wallet.html
@@ -79,7 +79,7 @@ <h1>My Wallet</h1>
                       </div>
                       <div class="col" form-error="form.accountNumber">
                         <label>เลขที่บัญชี</label>
-                        <input class="form-control" ng-disabled="!wallet.proposals || !isVerify" name="account" ng-model="formData.accountNumber" ng-pattern-restrict="^[0-9]*$" required/>
+                        <input class="form-control" ng-disabled="!wallet.proposals || !isVerify" name="accountNumber" ng-model="formData.accountNumber" ng-pattern-restrict="^[0-9]*$" required/>
                         <div input-error></div>
                       </div>
                     </div>