diff --git a/.env.tis b/.env.tis index 9abf20b..a541ac0 100644 --- a/.env.tis +++ b/.env.tis @@ -1,2 +1,5 @@ TENANT=tis DIST_DIR=tis +# TIS_BUILD_DATE= +# TIS_APP_VERSION= +# TIS_BUILD_NUMBER= diff --git a/angular.json b/angular.json index 9c5de5c..431e41c 100644 --- a/angular.json +++ b/angular.json @@ -44,8 +44,7 @@ } ], "outputHashing": "all", - "outputPath": "dist/default", - "serviceWorker": "ngsw-config.json" + "outputPath": "dist/default" }, "development": { "extractLicenses": false, @@ -80,8 +79,7 @@ } ], "outputHashing": "all", - "outputPath": "dist/production", - "serviceWorker": "ngsw-config.json" + "outputPath": "dist/production" }, "staging": { "extractLicenses": true, @@ -93,7 +91,6 @@ ], "optimization": true, "outputHashing": "all", - "serviceWorker": "ngsw-config.json", "sourceMap": false }, "tis": { @@ -138,8 +135,7 @@ } ], "outputHashing": "all", - "outputPath": "dist/tis", - "serviceWorker": "ngsw-config.json" + "outputPath": "dist/tis" }, "tis-development": { "assets": [ @@ -186,7 +182,6 @@ "optimization": false, "outputHashing": "all", "outputPath": "dist/tis", - "serviceWorker": "ngsw-config.json", "sourceMap": true } }, diff --git a/ngsw-config.json b/ngsw-config.json index e9c4674..eefe9b9 100644 --- a/ngsw-config.json +++ b/ngsw-config.json @@ -1,9 +1,9 @@ { "$schema": "./node_modules/@angular/service-worker/config/schema.json", "appData": { - "appVersion": "0.0.17", - "buildDate": "2026-05-16T16:43:54.103Z", - "buildNumber": 17 + "appVersion": "0.0.22", + "buildDate": "2026-05-16T16:59:05.769Z", + "buildNumber": 22 }, "assetGroups": [ { @@ -11,8 +11,7 @@ "name": "app", "resources": { "files": [ - "/favicon.ico", - "/index.html" + "/favicon.ico" ] }, "updateMode": "prefetch" diff --git a/src/app.config.ts b/src/app.config.ts index cc109a0..6a21d98 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -19,7 +19,7 @@ import { withEnabledBlockingInitialNavigation, withInMemoryScrolling, } from '@angular/router'; -import { provideServiceWorker } from '@angular/service-worker'; +// import { provideServiceWorker } from '@angular/service-worker'; // Use the consolidated preset that includes our custom variables import { ConfirmationService, MessageService } from 'primeng/api'; import { providePrimeNG } from 'primeng/config'; @@ -74,9 +74,9 @@ export const appConfig: ApplicationConfig = { withInterceptors([loggingInterceptor, authInterceptor, errorInterceptor, dedupInterceptor]), withInterceptorsFromDi(), ), - provideServiceWorker('ngsw-worker.js', { - enabled: !isDevMode(), - registrationStrategy: 'registerWhenStable:30000', - }), + // provideServiceWorker('ngsw-worker.js', { + // enabled: !isDevMode(), + // registrationStrategy: 'registerWhenStable:30000', + // }), ], }; diff --git a/src/app/domains/pos/layouts/pagesLayout/layout.component.ts b/src/app/domains/pos/layouts/pagesLayout/layout.component.ts index 58a119c..d4859ab 100644 --- a/src/app/domains/pos/layouts/pagesLayout/layout.component.ts +++ b/src/app/domains/pos/layouts/pagesLayout/layout.component.ts @@ -10,6 +10,7 @@ import { Card } from 'primeng/card'; import { Menu } from 'primeng/menu'; import { finalize } from 'rxjs'; import images from 'src/assets/images'; +import config from 'src/config'; import { PosInfoStore, PosProfileStore } from '../../store'; import { DeviceInfoStore } from '../../store/device.store'; import { PosMainMenuSidebarComponent } from '../mainMenuSidebar/main-menu-sidebar.component'; @@ -83,7 +84,7 @@ export class PosPagesLayoutComponent { now = new Date(); - homeRouteLink = '/pos'; + homeRouteLink = config.isPosApplication ? '/' : '/pos'; async getData() { if (!this.posInfo() || !this.posProfile()) { diff --git a/src/app/domains/pos/modules/landing/services/payment-bridge.service.ts b/src/app/domains/pos/modules/landing/services/payment-bridge.service.ts index 0d7da81..0bcfe39 100644 --- a/src/app/domains/pos/modules/landing/services/payment-bridge.service.ts +++ b/src/app/domains/pos/modules/landing/services/payment-bridge.service.ts @@ -17,7 +17,7 @@ export class PosPaymentBridgeService extends PosPaymentBridgeAbstract { this.toastServices.error({ text: '@@@@@@@@@@@@@' }); // @ts-ignore - window.webV = { + window.WebV = { onPaymentResult: () => { this.toastServices.error({ text: 'asdasdsadassadasdas' }); }, diff --git a/src/app/shared/components/dialog/light-bottomsheet.component.html b/src/app/shared/components/dialog/light-bottomsheet.component.html index 5fd859a..ac088f8 100644 --- a/src/app/shared/components/dialog/light-bottomsheet.component.html +++ b/src/app/shared/components/dialog/light-bottomsheet.component.html @@ -19,7 +19,7 @@ } } -
+
diff --git a/src/app/shared/components/dialog/light-bottomsheet.component.ts b/src/app/shared/components/dialog/light-bottomsheet.component.ts index d36628c..1924a0b 100644 --- a/src/app/shared/components/dialog/light-bottomsheet.component.ts +++ b/src/app/shared/components/dialog/light-bottomsheet.component.ts @@ -39,7 +39,9 @@ import { Button } from 'primeng/button'; right: 0; bottom: 0; left: 0; - max-height: 80svh; + max-height: 90vh; + display: flex; + flex-direction: column; background: var(--surface-card, #fff); border-radius: 12px 12px 0 0; box-shadow: none; @@ -51,13 +53,21 @@ import { Button } from 'primeng/button'; } .light-bottomsheet-content { - max-height: 80svh; - overflow: auto; + display: flex; + flex-direction: column; + flex: 1; + min-height: 0; padding-bottom: calc(0.75rem + env(safe-area-inset-bottom)); -webkit-overflow-scrolling: touch; overscroll-behavior: contain; } + .light-bottomsheet-body { + flex: 1; + min-height: 0; + overflow: auto; + } + .light-bottomsheet-header { display: flex; align-items: center; @@ -116,7 +126,7 @@ export class SharedLightBottomsheetComponent implements OnInit, OnDestroy, OnCha @Input() modal = true; @Input() closable = true; @Input() style: Record | undefined; - @Input() mobileDrawerHeight = '80svh'; + @Input() mobileDrawerHeight = '90vh'; @Input() transitionOptions = '130ms cubic-bezier(0.2, 0, 0, 1)'; @Output() onHide = new EventEmitter(); diff --git a/src/app/shared/components/input/input.component.ts b/src/app/shared/components/input/input.component.ts index e8ff507..54b5fb5 100644 --- a/src/app/shared/components/input/input.component.ts +++ b/src/app/shared/components/input/input.component.ts @@ -243,6 +243,9 @@ export class InputComponent { } onInput($event: Event, isPriceFormat?: boolean) { + if ((this.inputMode !== 'numeric' && this.inputMode !== 'decimal') || !isPriceFormat) { + return; + } const target = $event.target as HTMLInputElement | null; if (!target) return; @@ -280,7 +283,8 @@ export class InputComponent { value = this.lastValidNumericValue; numericValue = Number.isNaN(parseFloat(value)) ? 0 : parseFloat(value); - const isIdentifierField = ['mobile', 'phone', 'postalCode', 'nationalId'].includes(this.type); + // const isIdentifierField = ['mobile', 'phone', 'postalCode', 'nationalId'].includes(this.type); + const isIdentifierField = !this.numericValue; const restoredControlValue = isIdentifierField ? value : value === '' ? '' : numericValue; this.control.setValue(restoredControlValue); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 61b7975..8055915 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -2,8 +2,8 @@ export const environment = { production: false, // apiBaseUrl: 'http://194.59.214.243:5002', - // apiBaseUrl: 'http://192.168.128.73:5002', - apiBaseUrl: 'http://localhost:5002', + apiBaseUrl: 'http://192.168.128.73:5002', + // apiBaseUrl: 'http://localhost:5002', // host: 'http://194.59.214.243', host: 'localhost', port: 5000,