Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
Clubphp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Clubphp
Commits
7e6c0d93
Commit
7e6c0d93
authored
Apr 11, 2026
by
Mahmoud Aglan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes
parent
39f6a005
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
21 deletions
+21
-21
CategoryController.php
app/Modules/Inventory/Controllers/CategoryController.php
+3
-3
InventoryReportController.php
...dules/Inventory/Controllers/InventoryReportController.php
+2
-2
ItemController.php
app/Modules/Inventory/Controllers/ItemController.php
+4
-4
WarehouseController.php
app/Modules/Inventory/Controllers/WarehouseController.php
+3
-3
InventoryItem.php
app/Modules/Inventory/Models/InventoryItem.php
+1
-1
Supplier.php
app/Modules/Inventory/Models/Supplier.php
+1
-1
StockAuditService.php
app/Modules/Inventory/Services/StockAuditService.php
+1
-1
StockService.php
app/Modules/Inventory/Services/StockService.php
+2
-2
PackageController.php
app/Modules/Sales/Controllers/PackageController.php
+3
-3
SaleController.php
app/Modules/Sales/Controllers/SaleController.php
+1
-1
No files found.
app/Modules/Inventory/Controllers/CategoryController.php
View file @
7e6c0d93
...
@@ -46,7 +46,7 @@ class CategoryController extends Controller
...
@@ -46,7 +46,7 @@ class CategoryController extends Controller
public
function
store
(
Request
$request
)
:
Response
public
function
store
(
Request
$request
)
:
Response
{
{
$data
=
$this
->
extractData
(
$request
);
$data
=
$this
->
extractData
(
$request
);
$errors
=
$this
->
validate
(
$data
);
$errors
=
$this
->
validate
Input
(
$data
);
// Unique code
// Unique code
if
(
$data
[
'code'
]
!==
''
)
{
if
(
$data
[
'code'
]
!==
''
)
{
...
@@ -88,7 +88,7 @@ class CategoryController extends Controller
...
@@ -88,7 +88,7 @@ class CategoryController extends Controller
}
}
$data
=
$this
->
extractData
(
$request
);
$data
=
$this
->
extractData
(
$request
);
$errors
=
$this
->
validate
(
$data
);
$errors
=
$this
->
validate
Input
(
$data
);
// Unique code (exclude current)
// Unique code (exclude current)
if
(
$data
[
'code'
]
!==
''
)
{
if
(
$data
[
'code'
]
!==
''
)
{
...
@@ -128,7 +128,7 @@ class CategoryController extends Controller
...
@@ -128,7 +128,7 @@ class CategoryController extends Controller
];
];
}
}
private
function
validate
(
array
$data
)
:
array
private
function
validate
Input
(
array
$data
)
:
array
{
{
$errors
=
[];
$errors
=
[];
if
(
$data
[
'code'
]
===
''
)
{
if
(
$data
[
'code'
]
===
''
)
{
...
...
app/Modules/Inventory/Controllers/InventoryReportController.php
View file @
7e6c0d93
...
@@ -20,7 +20,7 @@ class InventoryReportController extends Controller
...
@@ -20,7 +20,7 @@ class InventoryReportController extends Controller
$categoryId
=
(
int
)
$request
->
get
(
'category_id'
,
0
);
$categoryId
=
(
int
)
$request
->
get
(
'category_id'
,
0
);
$db
=
App
::
getInstance
()
->
db
();
$db
=
App
::
getInstance
()
->
db
();
$where
=
'i.`
deleted_at` IS NULL
'
;
$where
=
'i.`
is_archived` = 0
'
;
$params
=
[];
$params
=
[];
if
(
$warehouseId
>
0
)
{
if
(
$warehouseId
>
0
)
{
...
@@ -178,7 +178,7 @@ class InventoryReportController extends Controller
...
@@ -178,7 +178,7 @@ class InventoryReportController extends Controller
$supplierId
=
(
int
)
$request
->
get
(
'supplier_id'
,
0
);
$supplierId
=
(
int
)
$request
->
get
(
'supplier_id'
,
0
);
$suppliers
=
$db
->
select
(
$suppliers
=
$db
->
select
(
"SELECT `id`, `name_ar`, `code` FROM `suppliers` WHERE `
deleted_at` IS NULL
ORDER BY `name_ar` ASC"
"SELECT `id`, `name_ar`, `code` FROM `suppliers` WHERE `
is_archived` = 0
ORDER BY `name_ar` ASC"
);
);
$orders
=
[];
$orders
=
[];
...
...
app/Modules/Inventory/Controllers/ItemController.php
View file @
7e6c0d93
...
@@ -51,7 +51,7 @@ class ItemController extends Controller
...
@@ -51,7 +51,7 @@ class ItemController extends Controller
public
function
store
(
Request
$request
)
:
Response
public
function
store
(
Request
$request
)
:
Response
{
{
$data
=
$this
->
extractData
(
$request
);
$data
=
$this
->
extractData
(
$request
);
$errors
=
$this
->
validate
(
$data
);
$errors
=
$this
->
validate
Input
(
$data
);
// Unique SKU
// Unique SKU
if
(
$data
[
'sku'
]
!==
''
)
{
if
(
$data
[
'sku'
]
!==
''
)
{
...
@@ -131,7 +131,7 @@ class ItemController extends Controller
...
@@ -131,7 +131,7 @@ class ItemController extends Controller
}
}
$data
=
$this
->
extractData
(
$request
);
$data
=
$this
->
extractData
(
$request
);
$errors
=
$this
->
validate
(
$data
);
$errors
=
$this
->
validate
Input
(
$data
);
// Unique SKU (exclude current)
// Unique SKU (exclude current)
if
(
$data
[
'sku'
]
!==
''
)
{
if
(
$data
[
'sku'
]
!==
''
)
{
...
@@ -169,7 +169,7 @@ class ItemController extends Controller
...
@@ -169,7 +169,7 @@ class ItemController extends Controller
"SELECT `id`, `sku`, `name_ar`, `sale_price_member`, `sale_price_nonmember`, `unit_of_measure`, `tracking_type`
"SELECT `id`, `sku`, `name_ar`, `sale_price_member`, `sale_price_nonmember`, `unit_of_measure`, `tracking_type`
FROM `inventory_items`
FROM `inventory_items`
WHERE (`name_ar` LIKE ? OR `sku` LIKE ? OR `barcode` LIKE ?)
WHERE (`name_ar` LIKE ? OR `sku` LIKE ? OR `barcode` LIKE ?)
AND `is_active` = 1 AND `
deleted_at` IS NULL
AND `is_active` = 1 AND `
is_archived` = 0
ORDER BY `name_ar` ASC LIMIT 20"
,
ORDER BY `name_ar` ASC LIMIT 20"
,
[
$search
,
$search
,
$search
]
[
$search
,
$search
,
$search
]
);
);
...
@@ -199,7 +199,7 @@ class ItemController extends Controller
...
@@ -199,7 +199,7 @@ class ItemController extends Controller
];
];
}
}
private
function
validate
(
array
$data
)
:
array
private
function
validate
Input
(
array
$data
)
:
array
{
{
$errors
=
[];
$errors
=
[];
if
(
$data
[
'sku'
]
===
''
)
{
if
(
$data
[
'sku'
]
===
''
)
{
...
...
app/Modules/Inventory/Controllers/WarehouseController.php
View file @
7e6c0d93
...
@@ -47,7 +47,7 @@ class WarehouseController extends Controller
...
@@ -47,7 +47,7 @@ class WarehouseController extends Controller
public
function
store
(
Request
$request
)
:
Response
public
function
store
(
Request
$request
)
:
Response
{
{
$data
=
$this
->
extractData
(
$request
);
$data
=
$this
->
extractData
(
$request
);
$errors
=
$this
->
validate
(
$data
);
$errors
=
$this
->
validate
Input
(
$data
);
// Unique code
// Unique code
if
(
$data
[
'code'
]
!==
''
)
{
if
(
$data
[
'code'
]
!==
''
)
{
...
@@ -123,7 +123,7 @@ class WarehouseController extends Controller
...
@@ -123,7 +123,7 @@ class WarehouseController extends Controller
}
}
$data
=
$this
->
extractData
(
$request
);
$data
=
$this
->
extractData
(
$request
);
$errors
=
$this
->
validate
(
$data
);
$errors
=
$this
->
validate
Input
(
$data
);
// Unique code (exclude current)
// Unique code (exclude current)
if
(
$data
[
'code'
]
!==
''
)
{
if
(
$data
[
'code'
]
!==
''
)
{
...
@@ -161,7 +161,7 @@ class WarehouseController extends Controller
...
@@ -161,7 +161,7 @@ class WarehouseController extends Controller
];
];
}
}
private
function
validate
(
array
$data
)
:
array
private
function
validate
Input
(
array
$data
)
:
array
{
{
$errors
=
[];
$errors
=
[];
if
(
$data
[
'code'
]
===
''
)
{
if
(
$data
[
'code'
]
===
''
)
{
...
...
app/Modules/Inventory/Models/InventoryItem.php
View file @
7e6c0d93
...
@@ -142,7 +142,7 @@ class InventoryItem extends Model
...
@@ -142,7 +142,7 @@ class InventoryItem extends Model
$params
[]
=
(
int
)
$filters
[
'warehouse_id'
];
$params
[]
=
(
int
)
$filters
[
'warehouse_id'
];
}
}
$where
.=
' AND i.`
deleted_at` IS NULL
'
;
$where
.=
' AND i.`
is_archived` = 0
'
;
$countRow
=
$db
->
selectOne
(
$countRow
=
$db
->
selectOne
(
"SELECT COUNT(*) as cnt FROM `inventory_items` i
{
$join
}
WHERE
{
$where
}
"
,
"SELECT COUNT(*) as cnt FROM `inventory_items` i
{
$join
}
WHERE
{
$where
}
"
,
...
...
app/Modules/Inventory/Models/Supplier.php
View file @
7e6c0d93
...
@@ -62,7 +62,7 @@ class Supplier extends Model
...
@@ -62,7 +62,7 @@ class Supplier extends Model
$params
[]
=
(
int
)
$filters
[
'is_active'
];
$params
[]
=
(
int
)
$filters
[
'is_active'
];
}
}
$where
.=
' AND `
deleted_at` IS NULL
'
;
$where
.=
' AND `
is_archived` = 0
'
;
$countRow
=
$db
->
selectOne
(
$countRow
=
$db
->
selectOne
(
"SELECT COUNT(*) as cnt FROM `suppliers` WHERE
{
$where
}
"
,
"SELECT COUNT(*) as cnt FROM `suppliers` WHERE
{
$where
}
"
,
...
...
app/Modules/Inventory/Services/StockAuditService.php
View file @
7e6c0d93
...
@@ -31,7 +31,7 @@ final class StockAuditService
...
@@ -31,7 +31,7 @@ final class StockAuditService
$stockItems
=
$db
->
select
(
$stockItems
=
$db
->
select
(
"SELECT iws.`item_id`, iws.`quantity` as system_quantity
"SELECT iws.`item_id`, iws.`quantity` as system_quantity
FROM `item_warehouse_stock` iws
FROM `item_warehouse_stock` iws
JOIN `inventory_items` i ON i.`id` = iws.`item_id` AND i.`
deleted_at` IS NULL
JOIN `inventory_items` i ON i.`id` = iws.`item_id` AND i.`
is_archived` = 0
WHERE
{
$itemWhere
}
WHERE
{
$itemWhere
}
ORDER BY i.`name_ar` ASC"
,
ORDER BY i.`name_ar` ASC"
,
$itemParams
$itemParams
...
...
app/Modules/Inventory/Services/StockService.php
View file @
7e6c0d93
...
@@ -66,7 +66,7 @@ final class StockService
...
@@ -66,7 +66,7 @@ final class StockService
// Verify item exists and is active
// Verify item exists and is active
$item
=
$db
->
selectOne
(
$item
=
$db
->
selectOne
(
"SELECT `id`, `tracking_type`, `name_ar` FROM `inventory_items` WHERE `id` = ? AND `
deleted_at` IS NULL
"
,
"SELECT `id`, `tracking_type`, `name_ar` FROM `inventory_items` WHERE `id` = ? AND `
is_archived` = 0
"
,
[
$itemId
]
[
$itemId
]
);
);
if
(
!
$item
)
{
if
(
!
$item
)
{
...
@@ -75,7 +75,7 @@ final class StockService
...
@@ -75,7 +75,7 @@ final class StockService
// Verify warehouse exists and is active
// Verify warehouse exists and is active
$warehouse
=
$db
->
selectOne
(
$warehouse
=
$db
->
selectOne
(
"SELECT `id` FROM `warehouses` WHERE `id` = ? AND `is_active` = 1 AND `
deleted_at` IS NULL
"
,
"SELECT `id` FROM `warehouses` WHERE `id` = ? AND `is_active` = 1 AND `
is_archived` = 0
"
,
[
$warehouseId
]
[
$warehouseId
]
);
);
if
(
!
$warehouse
)
{
if
(
!
$warehouse
)
{
...
...
app/Modules/Sales/Controllers/PackageController.php
View file @
7e6c0d93
...
@@ -45,7 +45,7 @@ class PackageController extends Controller
...
@@ -45,7 +45,7 @@ class PackageController extends Controller
$header
=
$this
->
extractHeader
(
$request
);
$header
=
$this
->
extractHeader
(
$request
);
$items
=
$this
->
extractItems
(
$request
);
$items
=
$this
->
extractItems
(
$request
);
$errors
=
$this
->
validate
(
$header
);
$errors
=
$this
->
validate
Input
(
$header
);
// Unique code
// Unique code
if
(
$header
[
'code'
]
!==
''
)
{
if
(
$header
[
'code'
]
!==
''
)
{
...
@@ -113,7 +113,7 @@ class PackageController extends Controller
...
@@ -113,7 +113,7 @@ class PackageController extends Controller
$header
=
$this
->
extractHeader
(
$request
);
$header
=
$this
->
extractHeader
(
$request
);
$items
=
$this
->
extractItems
(
$request
);
$items
=
$this
->
extractItems
(
$request
);
$errors
=
$this
->
validate
(
$header
);
$errors
=
$this
->
validate
Input
(
$header
);
// Unique code (exclude current)
// Unique code (exclude current)
if
(
$header
[
'code'
]
!==
''
)
{
if
(
$header
[
'code'
]
!==
''
)
{
...
@@ -175,7 +175,7 @@ class PackageController extends Controller
...
@@ -175,7 +175,7 @@ class PackageController extends Controller
return
$items
;
return
$items
;
}
}
private
function
validate
(
array
$header
)
:
array
private
function
validate
Input
(
array
$header
)
:
array
{
{
$errors
=
[];
$errors
=
[];
if
(
$header
[
'code'
]
===
''
)
$errors
[]
=
'كود الباقة مطلوب'
;
if
(
$header
[
'code'
]
===
''
)
$errors
[]
=
'كود الباقة مطلوب'
;
...
...
app/Modules/Sales/Controllers/SaleController.php
View file @
7e6c0d93
...
@@ -255,7 +255,7 @@ class SaleController extends Controller
...
@@ -255,7 +255,7 @@ class SaleController extends Controller
"SELECT `id`, `sku`, `name_ar`, `sale_price_member`, `sale_price_nonmember`, `sale_price_player`, `cost_price`, `tax_rate`, `unit_of_measure`, `tracking_type`
"SELECT `id`, `sku`, `name_ar`, `sale_price_member`, `sale_price_nonmember`, `sale_price_player`, `cost_price`, `tax_rate`, `unit_of_measure`, `tracking_type`
FROM `inventory_items`
FROM `inventory_items`
WHERE (`name_ar` LIKE ? OR `sku` LIKE ? OR `barcode` LIKE ?)
WHERE (`name_ar` LIKE ? OR `sku` LIKE ? OR `barcode` LIKE ?)
AND `is_sellable` = 1 AND `is_active` = 1 AND `
deleted_at` IS NULL
AND `is_sellable` = 1 AND `is_active` = 1 AND `
is_archived` = 0
ORDER BY `name_ar` ASC LIMIT 20"
,
ORDER BY `name_ar` ASC LIMIT 20"
,
[
$search
,
$search
,
$search
]
[
$search
,
$search
,
$search
]
);
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment