From a37102c3aee6aef3042e9a72a8e1d2e0a0d64b7c Mon Sep 17 00:00:00 2001 From: Baghaztra Date: Wed, 22 Oct 2025 08:57:12 +0700 Subject: [PATCH 1/2] [Update] docker container version --- README.md | 2 +- docker-compose.yml | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 436776e..f6dc97a 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ docker compose --env-file .env.production up -d --build docker exec -it abbauf_kasir_app php artisan migrate --seed # Atau import database secara manual -docker exec -i abbauf_kasir_db mysql -u kasir_user -pkasir_password kasir_db < ./toko_emas.sql +docker exec -i abbauf_kasir_db mysql -u kasir_user -pkasir_password kasir_db < ./storage/toko_emas.sql # Periksa database (opsional) docker exec -it abbauf_kasir_db bash diff --git a/docker-compose.yml b/docker-compose.yml index b4b5a7f..2bdf82a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: '3.9' services: # ======================================== @@ -61,7 +61,7 @@ services: container_name: abbauf_kasir_nginx restart: unless-stopped ports: - - "${APP_PORT:-80}:80" + - "81:80" volumes: # Nginx configuration - ./nginx.conf:/etc/nginx/conf.d/default.conf @@ -83,7 +83,8 @@ services: # MySQL Database # ======================================== mysql: - image: mysql:8.4 +# image: mysql:8.4 + image: mariadb:10.6 container_name: abbauf_kasir_db restart: unless-stopped environment: @@ -94,18 +95,18 @@ services: MYSQL_CHARACTER_SET_SERVER: utf8mb4 MYSQL_COLLATION_SERVER: utf8mb4_unicode_ci ports: - - "${DB_PORT:-3306}:3306" + - "3308:3306" volumes: - mysql_data:/var/lib/mysql # Optional: backup folder - ./docker/mysql/backups:/backups networks: - kasir_network - # healthcheck: - # test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-root_secret_password}"] - # interval: 10s - # timeout: 5s - # retries: 5 + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-root_secret_password}"] + interval: 10s + timeout: 5s + retries: 5 # command: --default-authentication-plugin=mysql_native_password # ======================================== @@ -116,7 +117,7 @@ services: container_name: abbauf_kasir_redis restart: unless-stopped ports: - - "${REDIS_PORT:-6379}:6379" + - "6380:6379" volumes: - redis_data:/data networks: From d55399ed553dd281aa4a27a34576acc1159531d6 Mon Sep 17 00:00:00 2001 From: dhilanradya Date: Wed, 22 Oct 2025 11:04:53 +0700 Subject: [PATCH 2/2] [fix] perbaikan input select + font qr code --- resources/js/components/PrintBarcode.vue | 6 +++--- resources/js/components/StrukOverlay.vue | 2 +- resources/js/pages/Tray.vue | 24 +++++++++++++----------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/resources/js/components/PrintBarcode.vue b/resources/js/components/PrintBarcode.vue index 454d5ae..f415f27 100644 --- a/resources/js/components/PrintBarcode.vue +++ b/resources/js/components/PrintBarcode.vue @@ -102,7 +102,7 @@ const printBarcode = () => { display: flex; flex-direction: column; gap: 0.5mm; - font-size: 5pt; + font-size: 8pt; line-height: 1.2; } @@ -116,12 +116,12 @@ const printBarcode = () => { } .item-name { - font-size: 6pt; + font-size: 8pt; line-height: 1.1; white-space: normal; word-wrap: break-word; position: absolute; - width: 36mm; + width: 34mm; text-align: center; transform: rotate(270deg); transform-origin: center; diff --git a/resources/js/components/StrukOverlay.vue b/resources/js/components/StrukOverlay.vue index 1353d67..b2560dd 100644 --- a/resources/js/components/StrukOverlay.vue +++ b/resources/js/components/StrukOverlay.vue @@ -255,7 +255,7 @@ const fetchSales = async () => { headers: { Authorization: `Bearer ${localStorage.getItem("token")}` } }) salesOptions.value = res.data.map(s => ({ value: s.id, label: s.nama })) - if (salesOptions.value.length > 0) selectedSales.value = salesOptions.value[0].value + selectedSales.value = '' } catch (e) { console.error('Error fetching sales:', e) } diff --git a/resources/js/pages/Tray.vue b/resources/js/pages/Tray.vue index b4c66b5..07997ad 100644 --- a/resources/js/pages/Tray.vue +++ b/resources/js/pages/Tray.vue @@ -3,17 +3,19 @@

NAMPAN

-
- -
- - -
+
+
+ +
+ + +
+