Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion AntPos/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
.DS_Store
dist
dist-ssr
*.local
*.local
AntPos/dev-dist/
19 changes: 13 additions & 6 deletions AntPos/src/components/Customer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,22 @@
</template>

<script setup>
import { computed, inject, onMounted, onUnmounted, watch } from 'vue';
import { computed, inject, onMounted, onUnmounted, watch, defineProps } from 'vue';
import emitter from '@/utils/emitter';
import Autocomplete from '@/components/custom_components/Autocomplete.vue';
import { createListResource } from 'frappe-ui';
import { createToast } from '@/utils';
import { usePosProfileStore } from '@/stores/posProfile';
import { useInvoiceStore } from '@/stores/pos';
const emit = defineEmits(['update:customer']);

let base = inject('base');

const props = defineProps({
customer: {
type: Object,
required: true,
},
});
const invoiceStore = useInvoiceStore()
const getCustomerGroups = computed(()=>{

if (usePosProfileStore()?.hasNoData){
Expand Down Expand Up @@ -95,10 +102,10 @@ onUnmounted(() => {
});

const selectedCustomer = computed({
get: () => base.customer,
get: () => props.customer,
set: (newVal) => {
if(base.is_return) return
base.customer = newVal;
if(invoiceStore.invoice.is_return) return
emit('update:customer', newVal);
emitter.emit('calctotal')
},
});
Expand Down
1 change: 0 additions & 1 deletion AntPos/src/components/Dialog/CloseShift.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ import emitter from '@/utils/emitter';

const store = usePosProfileStore();
const dialogVisible = ref(true);
const base = inject('base');
const data = ref(store.posProfileData.payments);

const totals = ref({
Expand Down
1 change: 0 additions & 1 deletion AntPos/src/components/Dialog/CustomerForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ import { usePosProfileStore } from '@/stores/posProfile';

const store = usePosProfileStore();
const dialogVisible = ref(true);
const base = inject('base');

const customer = ref({
customer_name: '',
Expand Down
21 changes: 11 additions & 10 deletions AntPos/src/components/Dialog/Held.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
:disabled="invoices.loading"

>
Next
Load more
</Button>
</div>
</div>
Expand All @@ -71,11 +71,13 @@ import { Dialog, Button, createListResource, createResource, TextInput, FeatherI
import { ref, inject, computed, watch } from 'vue';
import { createToast } from '@/utils';
import { usePosProfileStore } from '@/stores/posProfile';
import { usePermissionStore } from '@/stores/permissionStore';
import { usePermissionStore } from '@/stores/permission';
import { usersStore } from '@/stores/users';
import { useInvoiceStore } from '@/stores/pos';


const store = usePosProfileStore();
let base = inject('base');
const invoiceStore = useInvoiceStore()
const dialogVisible = ref(true);
const selectedInvoice = ref(null);
const searchQuery = ref("");
Expand Down Expand Up @@ -149,18 +151,17 @@ let salesInvoice = createResource({
const submitInvoice = () => {salesInvoice.fetch({ name: selectedInvoice.value });};

const addvalues = async ()=>{
base.invoice = { ...salesInvoice.data.docs[0], status: null }
base.is_return =salesInvoice.data.docs[0].is_return
base.items = salesInvoice.data.docs[0].items;
base.discount_amount = salesInvoice.data.docs[0].discount_amount;
base.additional_discount_percentage = salesInvoice.data.docs[0].additional_discount_percentage;
base.total = salesInvoice.data.docs[0].net_total;
invoiceStore.invoice = { ...salesInvoice.data.docs[0], status: null }
invoiceStore.items = salesInvoice.data.docs[0].items;
invoiceStore.invoice._discount_amount = salesInvoice.data.docs[0].discount_amount;
invoiceStore.invoice._additional_discount_percentage = salesInvoice.data.docs[0].additional_discount_percentage;
invoiceStore.invoice._total = salesInvoice.data.docs[0].net_total;
await get_value.fetch({
doctype: "Customer",
filters: { "name": salesInvoice.data.docs[0].customer },
fieldname: ['name', 'mobile_no', 'customer_group', 'territory', 'is_internal_customer'],
});
base.customer = get_value.data || {};
invoiceStore.invoiceCustomer = get_value.data || {};
searchQuery.value=''
handleDialogClose()
}
Expand Down
20 changes: 10 additions & 10 deletions AntPos/src/components/Dialog/Return.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
:disabled="invoices.loading"

>
Next
Load more
</Button>
</div>
</div>
Expand All @@ -71,17 +71,18 @@ import { Dialog, Button, createListResource, createResource, TextInput, debounce
import { ref, inject, computed, watch } from 'vue';
import { createToast } from '@/utils';
import { usePosProfileStore } from '@/stores/posProfile';
import { usePermissionStore } from '@/stores/permissionStore';
import { usePermissionStore } from '@/stores/permission';
import { usersStore } from '@/stores/users';
import { useInvoiceStore } from '@/stores/pos';

let base = inject('base');
const store = usePosProfileStore();
const dialogVisible = ref(true);
const selectedInvoice = ref(null);
const searchQuery = ref("");
const selectedPageLength = ref(20);
const handleDialogClose = () => { dialogVisible.value = false; };
const permissionStore = usePermissionStore();
const invoiceStore = useInvoiceStore()
const user = usersStore().getUser();

const setPageLength = (size) => {
Expand Down Expand Up @@ -210,19 +211,18 @@ async function splitSerialNumbers(serialString = "") {
}

const addvalues = async ()=>{
base.invoice = { ...runDoCMethod.data.docs[0], status: null ,name:"new-sales-invoice-jpodtuhocv" }
base.items = runDoCMethod.data.docs[0].items || [];
base.discount_amount = runDoCMethod.data.docs[0].discount_amount;
base.additional_discount_percentage = runDoCMethod.data.docs[0].additional_discount_percentage;
base.total = runDoCMethod.data.docs[0].net_total;
invoiceStore.invoice = { ...runDoCMethod.data.docs[0], status: null ,name:"new-sales-invoice-jpodtuhocv" }
invoiceStore.items = runDoCMethod.data.docs[0].items || [];
invoiceStore.invoice._discount_amount = runDoCMethod.data.docs[0].discount_amount;
invoiceStore.invoice._additional_discount_percentage = runDoCMethod.data.docs[0].additional_discount_percentage;
invoiceStore.invoice._total = runDoCMethod.data.docs[0].net_total;
await get_value.fetch({
doctype: "Customer",
filters: { "name": runDoCMethod.data.docs[0].customer },
fieldname: ['name', 'mobile_no', 'customer_group', 'territory', 'is_internal_customer'],
});
base.customer = get_value.data || {};
invoiceStore.invoiceCustomer = get_value.data || {};
searchQuery.value='';
base.is_return = 1;
handleDialogClose()
}

Expand Down
1 change: 0 additions & 1 deletion AntPos/src/components/Dialog/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ import ImageUploader from '@/components/Controls/ImageUploader.vue'
import { ref, inject } from 'vue';
import { getSettings } from '@/stores/settings'

let base = inject('base');
const dialogVisible = ref(true);
const { setting: settings, setupBrand } = getSettings()

Expand Down
Loading