#1585 #1586 (#1587)

adempiere · Feb 16, 2022 · 5542378 · 5542378
1 parent 7c09946
commit 5542378
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 3 deletions.
diff --git a/src/components/ADempiere/Form/VPOS/Options/index.vue b/src/components/ADempiere/Form/VPOS/Options/index.vue
@@ -339,7 +339,8 @@
                 style="cursor: pointer; text-align: center !important; color: black;min-height: 50px;"
                 @click="adviserPin ? validateOption($t('form.pos.optionsPoinSales.cashManagement.assignSeller')) : assignSeller()"
               >
-                <i class="el-icon-sold-out" />
+                <svg-icon icon-class="peoples" />
+                <i class="el-icon-bottom-right" />
                 <br>
                 {{ $t('form.pos.optionsPoinSales.cashManagement.assignSeller') }}
               </p>
@@ -351,12 +352,37 @@
                 style="cursor: pointer; text-align: center !important; color: black;min-height: 50px;"
                 @click="adviserPin ? validateOption($t('form.pos.optionsPoinSales.cashManagement.unassignSeller')) : unassignSeller()"
               >
-                <i class="el-icon-sold-out" />
+                <svg-icon icon-class="peoples" />
+                <i class="el-icon-top-right" />
                 <br>
                 {{ $t('form.pos.optionsPoinSales.cashManagement.unassignSeller') }}
               </p>
             </el-card>
           </el-col>
+          <el-col v-if="isAllowsAllocateSeller" :span="size" style="padding-left: 12px;padding-right: 12px;padding-bottom: 10px;">
+            <el-card shadow="hover" style="height: 100px">
+              <p
+                style="cursor: pointer; text-align: center !important; color: black;min-height: 50px;"
+                @click="adviserPin ? validateOption($t('form.pos.optionsPoinSales.cashManagement.transfer')) : transfer()"
+              >
+                <i class="el-icon-sort" />
+                <br>
+                {{ $t('form.pos.optionsPoinSales.cashManagement.transfer') }}
+              </p>
+            </el-card>
+          </el-col>
+          <el-col v-if="isAllowsAllocateSeller" :span="size" style="padding-left: 12px;padding-right: 12px;padding-bottom: 10px;">
+            <el-card shadow="hover" style="height: 100px">
+              <p
+                style="cursor: pointer; text-align: center !important; color: black;min-height: 50px;"
+                @click="adviserPin ? validateOption($t('form.pos.optionsPoinSales.cashManagement.moneyIncome')) : moneyIncome()"
+              >
+                <i class="el-icon-money" />
+                <br>
+                {{ $t('form.pos.optionsPoinSales.cashManagement.moneyIncome') }}
+              </p>
+            </el-card>
+          </el-col>
         </el-row>
       </el-collapse-item>
 
@@ -434,6 +460,26 @@
     >
       <assign-seller />
     </el-dialog>
+    <el-dialog
+      :title="$t('form.pos.optionsPoinSales.cashManagement.transfer')"
+      :visible.sync="showTransfer"
+      :is-loaded-panel="showTransfer"
+      width="60%"
+      center
+      class="dialogo-seller"
+    >
+      <cash-withdrawal />
+    </el-dialog>
+    <el-dialog
+      :title="$t('form.pos.optionsPoinSales.cashManagement.moneyIncome')"
+      :visible.sync="showMoneyIncome"
+      :is-loaded-panel="showMoneyIncome"
+      width="60%"
+      center
+      class="dialogo-seller"
+    >
+      <cash-opening />
+    </el-dialog>
   </div>
 </template>
 
@@ -586,6 +632,22 @@ export default {
         this.$store.commit('setShowUnassignSeller', value)
       }
     },
+    showTransfer: {
+      get() {
+        return this.$store.getters.getShowTransfer
+      },
+      set(value) {
+        this.$store.commit('setShowTransfer', value)
+      }
+    },
+    showMoneyIncome: {
+      get() {
+        return this.$store.getters.getShowMoneyIncome
+      },
+      set(value) {
+        this.$store.commit('setShowMoneyIncome', value)
+      }
+    },
     adviserPin() {
       return this.$store.getters.posAttributes.currentPointOfSales.isPosRequiredPin
     },
@@ -724,6 +786,12 @@ export default {
     unassignSeller() {
       this.$store.commit('setShowUnassignSeller', true)
     },
+    moneyIncome() {
+      this.$store.commit('setShowMoneyIncome', true)
+    },
+    transfer() {
+      this.$store.commit('setShowTransfer', true)
+    },
     openListOrdes() {
       this.showFieldListOrder = true
     },
@@ -820,6 +888,12 @@ export default {
         case this.$t('form.pos.optionsPoinSales.cashManagement.unassignSeller'):
           this.unassignSeller()
           break
+        case this.$t('form.pos.optionsPoinSales.cashManagement.moneyIncome'):
+          this.moneyIncome()
+          break
+        case this.$t('form.pos.optionsPoinSales.cashManagement.transfer'):
+          this.transfer()
+          break
       }
     },
     printTicket() {

diff --git a/src/store/modules/ADempiere/utils.js b/src/store/modules/ADempiere/utils.js
@@ -40,6 +40,8 @@ const initStateUtils = {
   showAssignSeller: false,
   showUnassignSeller: false,
   showPanelAddress: false,
+  showTransfer: false,
+  showMoneyIncome: false,
   quickSearchOrder: {}
 }
 
@@ -163,6 +165,12 @@ export default {
     },
     setShowPanelAddress(state, showPanelAddress) {
       state.showPanelAddress = showPanelAddress
+    },
+    setShowTransfer(state, showTransfer) {
+      state.showTransfer = showTransfer
+    },
+    setShowMoneyIncome(state, showMoneyIncome) {
+      state.showMoneyIncome = showMoneyIncome
     }
   },
   actions: {
@@ -364,6 +372,12 @@ export default {
     getShowUnassignSeller: (state) => {
       return state.showUnassignSeller
     },
+    getShowTransfer: (state) => {
+      return state.showTransfer
+    },
+    getShowMoneyIncome: (state) => {
+      return state.showMoneyIncome
+    },
     getQuickSearchOrder: (state) => {
       return state.quickSearchOrder
     }

diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
@@ -88,7 +88,6 @@ const actions = {
     dispatch('addCachedView', view)
   },
   addVisitedView({ commit }, view) {
-    console.log({ view })
     commit('ADD_VISITED_VIEW', view)
   },
   addCachedView({ commit }, view) {