Skip to content

Aef #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
11c41e0
first commit
natto1445 Feb 1, 2024
d48011e
Create gitignor
natto1445 Feb 1, 2024
b1a4e32
Update storefront.php
natto1445 Feb 1, 2024
6ba7ab5
Update storefront.php
natto1445 Feb 1, 2024
fdac76a
add product
natto1445 Feb 1, 2024
103210f
js product
natto1445 Feb 1, 2024
000013a
update db
natto1445 Feb 1, 2024
58f3699
edit product
natto1445 Feb 2, 2024
b77e194
select product where tyype
natto1445 Feb 4, 2024
03f491c
add tbl_product
natto1445 Feb 5, 2024
84a5f51
add name edit type product
natto1445 Feb 5, 2024
e37be23
manage bank
natto1445 Feb 5, 2024
f66de24
success setting bank
natto1445 Feb 5, 2024
953d29f
add picture
natto1445 Feb 5, 2024
d0341df
add pic
natto1445 Feb 7, 2024
58858a8
edit path pic product
natto1445 Feb 7, 2024
44fa74b
add cart and create order
natto1445 Feb 9, 2024
b001846
count cart
natto1445 Feb 10, 2024
9bf2e01
add cart front
natto1445 Feb 10, 2024
ca6229f
เพิ่ม env
sumead007 Feb 10, 2024
d8024b5
อัพเดทตะกร้า
sumead007 Feb 10, 2024
e9a2d56
Delete .env
sumead007 Feb 10, 2024
85b8c19
อัพเดท git
sumead007 Feb 10, 2024
2b9ccf1
view receipt
natto1445 Feb 10, 2024
f0fc19a
check ses
natto1445 Feb 10, 2024
7a428f8
Merge branch 'pok'
natto1445 Feb 10, 2024
e325143
cancel order
natto1445 Feb 12, 2024
95a18aa
confirm order
natto1445 Feb 17, 2024
fc8b48d
success order front
natto1445 Feb 18, 2024
462b026
update db
natto1445 Feb 20, 2024
1f9dd2f
view order front
natto1445 Feb 20, 2024
47067a8
bug count cookie cart
natto1445 Feb 21, 2024
dc3e0fa
edit slip
natto1445 Feb 24, 2024
1712014
description
natto1445 Feb 27, 2024
ccbf733
up logo
natto1445 Feb 27, 2024
6a32e2d
edit logo
natto1445 Feb 27, 2024
c4c9579
my order
natto1445 Feb 27, 2024
c08c70e
check regis and myorder
natto1445 Mar 1, 2024
b26fb05
point and pay order
natto1445 Mar 2, 2024
bdfb85e
update piont
natto1445 Mar 3, 2024
3ccd1eb
select2
natto1445 Mar 6, 2024
cf24fc2
update stauts and show slip
natto1445 Mar 8, 2024
d3ee1c9
อัพเดทตัดสตอก + เช็คสต๊อก
sumead007 Mar 9, 2024
efc1fb7
report
natto1445 Mar 10, 2024
d62188b
success report
natto1445 Mar 10, 2024
df7fdcc
product favorite
natto1445 Mar 10, 2024
82f295e
อัพเดทข้อ 1-2
sumead007 Mar 10, 2024
ac96453
use point
natto1445 Mar 11, 2024
aad6230
Merge branch 'aef'
natto1445 Mar 11, 2024
fdf41ce
usepoint font
natto1445 Mar 11, 2024
111d9ef
cut point and search
natto1445 Mar 15, 2024
62ee4bd
up database
natto1445 Mar 16, 2024
95d3404
เพิ่มตัดสต็อก+เชคสินค้า ขายหน้าร้าน
sumead007 Mar 17, 2024
1127e11
require zend barcode
natto1445 Mar 20, 2024
77fda1e
use barcode
natto1445 Mar 22, 2024
bd1f012
create barcode and show barcode
natto1445 Mar 22, 2024
c9048a8
cancel order
natto1445 Mar 23, 2024
1230e27
เพิ่ม return stock
sumead007 Mar 24, 2024
4ed19b1
ยิงบาร์โค้ดสินค้า
natto1445 Mar 29, 2024
8d57964
ใส่ บาร์โค้ดสินค้าเอง และ รายงานมีต้นทุน
natto1445 Apr 6, 2024
e219dbb
เพิ่ม Folder
natto1445 Apr 8, 2024
d167ee7
pay_type and tracking number
natto1445 Apr 8, 2024
3f1bbed
register
natto1445 Apr 8, 2024
09439b6
แก้ไขอัพรูป พรีวิวผิด div and lock system
natto1445 Apr 8, 2024
0abfc9e
lock date
natto1445 Apr 8, 2024
ec5d2a0
hidden lock
natto1445 Apr 9, 2024
06f55b1
อัพเดท htaccess
sumead007 Apr 9, 2024
c9b0b2a
เพิ่ม gitignore (pubilc + .htaccess)
sumead007 Apr 10, 2024
44abfc3
อัพเดท htaccess
sumead007 Apr 10, 2024
4880bc5
rename Upper
natto1445 Apr 10, 2024
3fb0292
upper file
natto1445 Apr 10, 2024
83af309
Revert "rename Upper"
natto1445 Apr 10, 2024
7c2672e
Revert "hidden lock"
natto1445 Apr 10, 2024
671804d
Merge remote-tracking branch 'origin/aef'
sumead007 Apr 10, 2024
64f386f
head receipt
natto1445 Apr 16, 2024
62457fa
delete lock code
natto1445 Apr 19, 2024
da9dc7e
ออกรายงาน pdf และ เตือนออเดอร์ออนไลน์
natto1445 May 3, 2024
9d1227f
report minstock and product exp
natto1445 Jun 2, 2024
d04f062
hta
natto1445 Jun 2, 2024
1ee29d7
Update .gitignore
sumead007 Jun 2, 2024
dfaadba
add pic production
natto1445 Nov 10, 2024
d16bebd
git ignor
natto1445 Nov 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DB_USERNAME=
DB_PASSWORD=
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/vendor
.env
.htaccess
/barcodes
3 changes: 2 additions & 1 deletion .htaccess
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
RewriteEngine on
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule .* index.php/$0 [PT,L]
RewriteRule ^(.*)$ index.php?/$1 [PT,L]
13 changes: 13 additions & 0 deletions .htaccess.copy
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
สำหรับ production
RewriteEngine on
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?/$1 [PT,L]


สำหรับ dev
RewriteEngine on
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule .* index.php/$0 [PT,L]
Binary file added application/.DS_Store
Binary file not shown.
40 changes: 20 additions & 20 deletions application/config/autoload.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
defined('BASEPATH') or exit('No direct script access allowed');

/*
| -------------------------------------------------------------------
Expand Down Expand Up @@ -28,7 +28,7 @@
| 6. Language files
| 7. Models
|
*/
*/

/*
| -------------------------------------------------------------------
Expand All @@ -38,7 +38,7 @@
|
| $autoload['packages'] = array(APPPATH.'third_party', '/usr/local/shared');
|
*/
*/
$autoload['packages'] = array();

/*
Expand All @@ -51,14 +51,14 @@
|
| Prototype:
|
| $autoload['libraries'] = array('database', 'email', 'session');
| $autoload['libraries'] = array('database', 'email', 'session');
|
| You can also supply an alternative library name to be assigned
| in the controller:
|
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
$autoload['libraries'] = array();
| $autoload['libraries'] = array('user_agent' => 'ua');
*/
$autoload['libraries'] = array('Library_main', 'session', 'zend');

/*
| -------------------------------------------------------------------
Expand All @@ -71,14 +71,14 @@
|
| Prototype:
|
| $autoload['drivers'] = array('cache');
| $autoload['drivers'] = array('cache');
|
| You can also supply an alternative property name to be assigned in
| the controller:
|
| $autoload['drivers'] = array('cache' => 'cch');
| $autoload['drivers'] = array('cache' => 'cch');
|
*/
*/
$autoload['drivers'] = array();

/*
Expand All @@ -87,22 +87,22 @@
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['helper'] = array('url', 'file');
*/
$autoload['helper'] = array();
| $autoload['helper'] = array('url', 'file');
*/
$autoload['helper'] = array('url', 'cookie');

/*
| -------------------------------------------------------------------
| Auto-load Config files
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['config'] = array('config1', 'config2');
| $autoload['config'] = array('config1', 'config2');
|
| NOTE: This item is intended for use ONLY if you have created custom
| config files. Otherwise, leave it blank.
|
*/
*/
$autoload['config'] = array();

/*
Expand All @@ -111,12 +111,12 @@
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['language'] = array('lang1', 'lang2');
| $autoload['language'] = array('lang1', 'lang2');
|
| NOTE: Do not include the "_lang" part of your file. For example
| "codeigniter_lang.php" would be referenced as array('codeigniter');
|
*/
*/
$autoload['language'] = array();

/*
Expand All @@ -125,11 +125,11 @@
| -------------------------------------------------------------------
| Prototype:
|
| $autoload['model'] = array('first_model', 'second_model');
| $autoload['model'] = array('first_model', 'second_model');
|
| You can also supply an alternative model name to be assigned
| in the controller:
|
| $autoload['model'] = array('first_model' => 'first');
*/
| $autoload['model'] = array('first_model' => 'first');
*/
$autoload['model'] = array();
Loading