Skip to content

Commit

Permalink
Cangelog:
Browse files Browse the repository at this point in the history
- Fixed: #2074
- Fixed: Shipping Popup
  • Loading branch information
Blair2004 committed Oct 1, 2024
1 parent a10cf72 commit f3497d1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/nexopos.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* This is the core version of NexoPOS. This is used to displays on the
* dashboard and to ensure a compatibility with the modules.
*/
'version' => '5.2.6',
'version' => '5.2.7',

/**
* --------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export default {
}
try {
const selection = await new Promise( ( resolve, reject ) => {
const unitQuantityId = await new Promise( ( resolve, reject ) => {
Popup.show( nsSelectPopupVue, {
label: __( 'Choose The Unit' ),
options: result.unit_quantities.map( unitQuantity => {
Expand All @@ -213,14 +213,14 @@ export default {
});
const unitQuantity = result.unit_quantities
.filter( unitQuantity => parseInt( unitQuantity.id ) === parseInt( selection[0].value ) );
.filter( unitQuantity => parseInt( unitQuantity.id ) === parseInt( unitQuantityId ) );
/**
* Adding product to the Array
*/
this.products.push({
name: result.name,
unit_quantity_id: selection[0].value,
unit_quantity_id: unitQuantityId,
unit_quantity: unitQuantity[0],
unit_id: unitQuantity[0].unit.id,
unit: unitQuantity[0].unit,
Expand Down
8 changes: 5 additions & 3 deletions resources/ts/pos-init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import Tax from "./libraries/tax";
import * as math from "mathjs"
import nsPosLoadingPopupVue from "./popups/ns-pos-loading-popup.vue";
import { nsAlertPopup, nsConfirmPopup, nsPromptPopup } from "./components/components";

import nsPosShippingPopup from "./popups/ns-pos-shipping-popup.vue";
import nsLayawayPopup from "./popups/ns-pos-layaway-popup.vue";

/**
* these are dynamic component
Expand All @@ -38,8 +39,9 @@ const nsPosOrderTypeButton = (<any>window).nsPosOrderTypeButton = defineAsy
const nsPosCustomersButton = (<any>window).nsPosCustomersButton = defineAsyncComponent( () => import('./pages/dashboard/pos/header-buttons/ns-pos-' + 'customers' + '-button.vue' ) );
const nsPosResetButton = (<any>window).nsPosResetButton = defineAsyncComponent( () => import('./pages/dashboard/pos/header-buttons/ns-pos-' + 'reset' + '-button.vue' ) );
const nsPosCashRegister = (<any>window).nsPosCashRegister = defineAsyncComponent( () => import('./pages/dashboard/pos/header-buttons/ns-pos-' + 'registers' + '-button.vue' ) );
const nsLayawayPopup = (<any>window).nsLayawayPopup = defineAsyncComponent( () => import('./popups/ns-pos-' + 'layaway' + '-popup.vue' ) );
const nsPosShippingPopup = (<any>window).nsPosShippingPopup = defineAsyncComponent( () => import('./popups/ns-pos-' + 'shipping' + '-popup.vue' ) );

(<any>window).nsLayawayPopup = nsLayawayPopup;
(<any>window).nsPosShippingPopup = nsPosShippingPopup;

( window as any ).CustomerQueue = CustomerQueue;
( window as any ).PaymentQueue = PaymentQueue;
Expand Down

1 comment on commit f3497d1

@l34android
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks man, I was just about to fork this. Best wishes.

Please sign in to comment.