- {{ item.warehouse }}
+ {{ price.warehouse }}
|
{
- item.quantity += item.grouping;
+ price.quantity -= price.grouping;
+ }
+ "
+ @click.exact="
+ () => {
+ price.quantity += price.grouping;
}
"
>
- {{ item.grouping }}
+ {{ price.grouping }}
- x {{ toCurrency(item.price) }}
+ x {{ toCurrency(price.price) }}
|
-
|
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index bd2099756..4cc96e9e2 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -11,7 +11,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import useNotify from 'src/composables/useNotify.js';
import axios from 'axios';
import { toDateFormat } from 'src/filters/date';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
import { useVnConfirm } from 'composables/useVnConfirm';
const emit = defineEmits(['updateDiscounts', 'getMana', 'refreshTable']);
@@ -48,7 +48,7 @@ const { push } = useRouter();
const { t } = useI18n();
const { dialog } = useQuasar();
const { notify } = useNotify();
-const role = useRole();
+const acl = useAcl();
const btnDropdownRef = ref(null);
const { openConfirmationModal } = useVnConfirm();
@@ -58,8 +58,10 @@ const isClaimable = computed(() => {
if (ticket.value) {
const landedPlusWeek = new Date(ticket.value.landed);
landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
- const hasClaimManagerRole = role.hasAny('claimManager');
- return landedPlusWeek >= Date.vnNew() || hasClaimManagerRole;
+ const createAfterDeadline = acl.hasAny([
+ { model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
+ ]);
+ return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
}
return false;
});
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 25ab92c9b..95e0b986e 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -15,6 +15,9 @@ const columns = computed(() => [
name: 'paymentDate',
label: t('worker.balance.tableVisibleColumns.paymentDate'),
create: true,
+ columnCreate: {
+ required: true,
+ },
component: 'date',
field: 'paymentDate',
cardVisible: true,
@@ -24,6 +27,9 @@ const columns = computed(() => [
name: 'incomeTypeFk',
label: t('worker.balance.tableVisibleColumns.incomeType'),
create: true,
+ columnCreate: {
+ required: true,
+ },
component: 'select',
attrs: {
options: payrollComponents,
@@ -37,6 +43,9 @@ const columns = computed(() => [
name: 'debit',
label: t('worker.balance.tableVisibleColumns.debit'),
create: true,
+ columnCreate: {
+ required: true,
+ },
component: 'input',
field: 'debit',
cardVisible: true,
@@ -46,6 +55,9 @@ const columns = computed(() => [
name: 'credit',
label: t('worker.balance.tableVisibleColumns.credit'),
create: true,
+ columnCreate: {
+ required: true,
+ },
component: 'input',
field: 'credit',
cardVisible: true,
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 13f9e9795..73ea34fe9 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -206,6 +206,8 @@ const handlePhotoUpdated = (evt = false) => {