Merge remote-tracking branch 'origin/master'

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Wed Sep 25 10:28:36 CST 2024
-VERSION_CODE=503
+#Wed Sep 25 17:24:40 CST 2024
+VERSION_CODE=507

Strides-APP/app/pages/chargeV2/PaymentListV2.js

@@ -56,29 +56,31 @@ export default class PaymentListV2 extends Component {
       chargeBoxId: this.props.chargeBoxId
     }).then(res => {
       if (res.data) {
-        this.setState({
-          options: res.data,
-          isloading: false
-        })
+        let index = 0;
         if (this.props.payType && this.props.payType.code) {
           for (let i = 0; i < res.data.length; i++) {
             let type = res.data[i];
             if (type.code == this.props.payType.code) {
-              this.changeMethod(i);
+              index = i;
               break;
             }
           }
         } else {
-          let index = 0;
           for (let i = 0; i < res.data.length; i++) {
             let type = res.data[i];
-            if (type.def) {
+            if (type.code == "fleet_group_wallet" || type.code == "fleet_individual_wallet") {
               index = i;
+              type.def = true;
               break;
             }
           }
-          this.changeMethod(index);
         }
+        this.setState({
+          options: res.data,
+          isloading: false
+        }, () => {
+          this.changeMethod(index);
+        });
       }
     }).catch(err => {
 

Strides-Admin/src/views/limit2/detail.vue

@@ -16,6 +16,7 @@
               <el-select
                 class="add-text"
                 v-model="form.groupPk"
+                :disabled="form.onlyView"
                 placeholder="Select with search">
                 <el-option
                   v-for="(item, index) in options.group"
@@ -30,7 +31,8 @@
               <el-select
                 class="add-text"
                 v-model="form.providerPk"
-                placeholder="Select">
+                placeholder="Select"
+                :disabled="form.onlyView">
                 <el-option
                   v-for="(item, index) in options.provider"
                   :key="index"
@@ -47,7 +49,8 @@
                 type="daterange"
                 format="dd/MM/yyyy"
                 value-format="dd/MM/yyyy"
-                placeholder="Select date"/>
+                placeholder="Select date"
+                :disabled="form.onlyView"/>
             </el-form-item>
             <el-form-item
               label="Monthly Credit Limit:"
@@ -57,7 +60,8 @@
                 class="add-text"
                 v-model="form.creditLimitAmount"
                 placeholder=""
-                maxlength="10"/>
+                maxlength="10"
+                :readonly="form.onlyView"/>
             </el-form-item>
           </div>
           <div class="form-right" v-if="isEdit">
@@ -87,7 +91,7 @@
               label="Overall Balance:">
               <el-input
                 class="add-text"
-                :value="form.individualCredit + '/' + form.groupCredit"
+                :value="form.overallBalance"
                 readonly/>
             </el-form-item>
           </div>
@@ -116,7 +120,7 @@
             prop="currentConsumptionCredit"
             min-width="140">
             <template slot-scope="{row}">
-              <span>{{row.creditLimitRemainingAmount}}/{{row.groupCredit}}</span>
+              <span>{{row.groupCurrentConsumption}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -127,6 +131,8 @@
         <plans
           :id="form.groupCreditPk"
           :groupPk="form.groupPk"
+          :canEdit="!form.onlyView"
+          :canDelete="form.canDelete"
           v-if="form.groupCreditPk"
           @refresh="getLimitInfo"/>
         <p></p>
@@ -140,6 +146,7 @@
             Cancel
           </el-button>
           <el-button
+            v-if="!form.onlyView"
             style="margin-left: 20px;"
             type="primary"
             :loading="loading.save"
@@ -150,7 +157,7 @@
         <div
           class="flex1"
           style="margin-left: 20px;"
-          v-if="isEdit">
+          v-if="isEdit && !form.onlyView">
           <span
             class="add-text"
             :title='"CREATED BY " + form.createdBy + " ON " + form.createdOn'>
@@ -181,7 +188,9 @@ export default {
         groupPk: "",
         providerPk: "",
         effectivePeriod: ["", ""],
-        creditLimitAmount: ""
+        creditLimitAmount: "",
+        onlyView: false,
+        canDelete: true
       },
       rules: {
         groupPk: {

Strides-Admin/src/views/limit2/index.vue

@@ -46,7 +46,7 @@
           <span
             class="link-type"
             @click="editLimit(row)"
-            v-if="!$route.meta.onlyView && row.auditStatusName != 'Approved'">
+            v-if="!$route.meta.onlyView">
             {{ row.groupName }}
           </span>
           <span v-else>{{ row.groupName }}</span>
@@ -108,6 +108,11 @@
                 v-if="row.auditStatusName != 'Approved'">
                 Edit
               </el-dropdown-item>
+              <el-dropdown-item
+                command="editLimit"
+                v-else>
+                View
+              </el-dropdown-item>
               <el-dropdown-item
                 command="viewApproval">
                 View Approval

Strides-Admin/src/views/limit2/plans.vue

@@ -4,7 +4,8 @@
       <el-button
         type="primary"
         icon="el-icon-plus"
-        @click="showAddPlan">
+        @click="showAddPlan"
+        v-if="canEdit">
         Individual Plan
       </el-button>
     </div>
@@ -20,21 +21,30 @@
         align="center"
         label="Date Created"
         prop="createTime"
-        min-width="120"/>
+        min-width="150"/>
       <el-table-column
         align="center"
         label="Assigned Users"
         prop="assignedUsers"
-        min-width="120"/>
+        min-width="150">
+        <template slot-scope="{row}">
+          <span
+            v-if="canEdit"
+            class="link-type"
+            @click="assignPlan(row)">{{row.assignedUsers}}</span>
+          <span v-else>{{row.assignedUsers}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         align="center"
         label="Current Consumption"
-        prop="currentConsumptionCredit"
-        min-width="140"/>
+        prop="individualCurrentConsumption"
+        min-width="170"/>
       <el-table-column
         align="center"
         label="Action"
-        min-width="80">
+        min-width="80"
+        v-if="canEdit">
         <template slot-scope="{row, $index}">
           <el-dropdown
             class="action-dropdown"
@@ -46,7 +56,8 @@
                 Assign Users
               </el-dropdown-item>
               <el-dropdown-item
-                command="deletePlan">
+                command="deletePlan"
+                v-if="canDelete">
                 Delete
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -110,6 +121,14 @@ export default {
     groupPk: {
       type: Number|String,
       default: ""
+    },
+    canEdit: {
+      type: Boolean,
+      default: true
+    },
+    canDelete: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

Strides-Admin/src/views/site2/index.vue

@@ -198,13 +198,14 @@ import waves from '@/directive/waves'
 // secondary package based on el-pagination
 import Pagination from '@/components/Pagination'
 import TableAction from '@/components/TableAction.vue'
+import HistoryRate from '../site/historyRate.vue'
 import site from '../../http/api/site'
 import provider from '../../http/api/provider'
 import { getRoleName } from '@/utils/auth'
 
 export default {
   name: 'SiteManagement',
-  components: { Pagination, TableAction },
+  components: { HistoryRate, Pagination, TableAction },
   directives: { waves },
   data() {
     return {