From c1dcf4e3c6b53b162a0a8ed5158fb1b39d17a3fa Mon Sep 17 00:00:00 2001 From: jekkos Date: Wed, 28 Aug 2024 00:04:53 +0200 Subject: [PATCH] Fix for giftcard suggestions (#4030) Switch back to master in docker-compose.yml --- app/Controllers/Giftcards.php | 2 +- docker-compose.yml | 4 ++-- docker/docker-mysql.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Controllers/Giftcards.php b/app/Controllers/Giftcards.php index 770be9baa..e685177fe 100644 --- a/app/Controllers/Giftcards.php +++ b/app/Controllers/Giftcards.php @@ -58,7 +58,7 @@ class Giftcards extends Secure_Controller */ public function getSuggest(): void { - $search = $this->request->getPost('term'); + $search = $this->request->getGet('term'); $suggestions = $this->giftcard->get_search_suggestions($search, true); echo json_encode($suggestions); diff --git a/docker-compose.yml b/docker-compose.yml index e917f26a1..2f60f5c08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,10 +3,10 @@ include: services: sqlscript: - image: jekkos/opensourcepos:sql-ci4-branch + image: jekkos/opensourcepos:sqlscript command: /bin/sh -c 'exit 0' ospos: - image: jekkos/opensourcepos:ci4-branch + image: jekkos/opensourcepos:master restart: always depends_on: - mysql diff --git a/docker/docker-mysql.yml b/docker/docker-mysql.yml index f4a03fc45..d3e9cf347 100644 --- a/docker/docker-mysql.yml +++ b/docker/docker-mysql.yml @@ -1,4 +1,3 @@ -version: '2' volumes: uploads: @@ -20,8 +19,9 @@ services: - "3306" networks: - app_net + volumes_from: + - sqlscript volumes: - - ./app/Database:/docker-entrypoint-initdb.d - mysql:/var/lib/mysql:rw environment: - MYSQL_ROOT_PASSWORD=pointofsale