From 1bd1f644c9321022ee0605e03e0d373ccf053043 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 6 Nov 2023 18:37:53 +0530
Subject: [PATCH] Bug Fixes 6th Nov : ps

---
 app/Controllers/Books.php   | 2 +-
 app/Models/BooksModel.php   | 4 ++--
 app/Models/InvoiceModel.php | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/Books.php b/app/Controllers/Books.php
index ff9abcd1..a8173f3f 100755
--- a/app/Controllers/Books.php
+++ b/app/Controllers/Books.php
@@ -68,7 +68,7 @@ class Books extends BaseController
         $session_uid = get_logged_user_id();
         $session_bid = get_business_id();
 
-              $BooksModel = new BooksModel();
+        $BooksModel = new BooksModel();
         $data = [
 
             'title' => $this->request->getPost('title'),
diff --git a/app/Models/BooksModel.php b/app/Models/BooksModel.php
index 5c0c1759..9dc67d01 100644
--- a/app/Models/BooksModel.php
+++ b/app/Models/BooksModel.php
@@ -30,12 +30,12 @@ class BooksModel extends Model
     public function getnonMembershiplist($business_id)
 {
     $builder = $this->builder();
-    $builder->select('books.book_id, books.title, books.price, books.duration,books.isactive,books.publisher,books.genre,books.language,books.publication_date,category.name as name');
+    $builder->select('books.book_id, books.title, books.price, books.duration,books.isactive,books.publisher,books.genre,books.language,books.publication_date,GROUP_CONCAT(category.name SEPARATOR ',') as name');
     $builder->join('book_categories', 'book_categories.book_id = books.book_id', 'left');
     $builder->join('category', 'category.id = book_categories.category_id', 'left');
     $builder->where('books.business_id', $business_id);
     $builder->where('category.name !=', 'membership'); // Exclude books with the category name "membership"
-
+    $builder->groupBy('books.book_id');
     $query = $builder->get();
 
     $books = [];
diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php
index 56ab70d0..d75a0459 100644
--- a/app/Models/InvoiceModel.php
+++ b/app/Models/InvoiceModel.php
@@ -199,6 +199,7 @@ public function getNonMembershipCategoryBooks()
     ->join('book_categories', 'book_categories.book_id= books.book_id', 'left')
     ->join('category','category.id=book_categories.category_id')
         ->where('category.name !=', 'membership')
+        ->groupBy('books.book_id')
         ->get()
         ->getResult();
 }