Commit Graph

756 Commits

Author SHA1 Message Date
Amir f5ae8a070e Merge branch 'main' into amir_dev 2022-09-05 16:22:43 +08:00
Nur Izzati Zulkifli ea19fb834f Merge branch 'atie' into 'main'
tambah function lelong KB1

See merge request online-sistem1/lelong!185
2022-09-05 06:39:03 +00:00
Nur Izzati Zulkifli 726279a6c7 tambah function lelong KB1 2022-09-05 14:36:56 +08:00
Amir cf972c0d68 delete, update photo marhun 2022-09-05 14:33:58 +08:00
Nur Izzati Zulkifli 2327b98b30 Merge branch 'amir_dev' into 'main'
add migration filemarhun, add photo marhun

See merge request online-sistem1/lelong!184
2022-09-05 01:14:40 +00:00
Amir 71842138bf add photo marhun 2022-09-05 09:09:21 +08:00
Amir 996665a3ee add migration filemarhun 2022-09-04 09:50:30 +08:00
Nur Izzati Zulkifli 27f20fe54e Merge branch 'amir_dev' into 'main'
merge request amir_dev

See merge request online-sistem1/lelong!183
2022-08-30 01:23:36 +00:00
Amir ce61d2461d filter sidebar khazanah, pc, penilai 2022-08-30 09:07:43 +08:00
Amir 75b88b660b add view scanbarcode 2022-08-30 08:59:00 +08:00
Amir 2a408f6058 Merge branch 'main' into amir_dev 2022-08-30 08:53:44 +08:00
Nur Izzati Zulkifli 20ac56dea6 Merge branch 'amirah' into 'main'
Update 2022_03_07_061858_create_pengesahan_table.php

See merge request online-sistem1/lelong!182
2022-08-29 08:18:14 +00:00
Amirah22 889630eef7 Update 2022_03_07_061858_create_pengesahan_table.php 2022-08-29 16:16:48 +08:00
Nur Izzati Zulkifli e87d643a2b Merge branch 'amirah' into 'main'
update slip serahan, migrate table scanmarhun

See merge request online-sistem1/lelong!181
2022-08-29 08:12:33 +00:00
Amirah22 d8a51d060a update slip serahan, migrate table scanmarhun 2022-08-29 16:03:22 +08:00
Nur Izzati Zulkifli ab016edc7c Merge branch 'nisha' into 'main'
pembetulan 23/8/2022

See merge request online-sistem1/lelong!180
2022-08-29 07:49:38 +00:00
nishaMuhd 1ec0493054 pembetulan 23/8/2022
2) disabled button tangguh lelong kat cwgn
4) button start lelong (utk semua cwgn, hanya klik button offline utk cwgn yg tak boleh start lelong)
2022-08-29 15:45:56 +08:00
Amir 8b1d0fc93f try snap marhun 2022-08-28 12:26:58 +08:00
Nur Izzati Zulkifli 3c3882e839 Merge branch 'amir_dev' into 'main'
add role penilai, add description marhun, fix registration,

See merge request online-sistem1/lelong!179
2022-08-25 02:48:06 +00:00
Amir 4eac4b45fa add role penilai, add description marhun, fix registration, 2022-08-25 10:19:43 +08:00
Muhamad Amir Hassan Hamzan 4eb0aa9116 Merge branch 'amir_dev' into 'main'
add file upload, function null

See merge request online-sistem1/lelong!178
2022-08-23 00:51:28 +00:00
Amir 3c2fdd07a7 add file upload, function null 2022-08-23 07:56:19 +08:00
Nur Izzati Zulkifli 679c8f07e3 Merge branch 'amirah' into 'main'
update simula fasa 2 percubaan

See merge request online-sistem1/lelong!177
2022-08-22 08:51:49 +00:00
Amirah22 c59cd0a8e8 update simula fasa 2 percubaan 2022-08-22 16:49:51 +08:00
Nur Izzati Zulkifli d1a6b71e56 Merge branch 'nisha' into 'main'
update detail senarai simulasi fasa2

See merge request online-sistem1/lelong!176
2022-08-22 08:40:15 +00:00
nishaMuhd 4b236b8660 update detail senarai simulasi fasa2 2022-08-22 16:03:50 +08:00
Nur Izzati Zulkifli 201769b794 Merge branch 'nisha' into 'main'
correction comment by abe lah

See merge request online-sistem1/lelong!175
2022-08-22 01:52:30 +00:00
nishaMuhd 83e062cdf0 correction comment by abe lah 2022-08-22 09:46:54 +08:00
Nur Izzati Zulkifli bb2f9dc608 Merge branch 'amirah' into 'main'
update slip sikit deh

See merge request online-sistem1/lelong!174
2022-08-21 04:36:28 +00:00
Amirah22 c7e7c85140 update slip sikit deh 2022-08-21 12:03:11 +08:00
Nur Izzati Zulkifli eb3e88a821 Merge branch 'amirah' into 'main'
update slip serahan

See merge request online-sistem1/lelong!173
2022-08-21 02:07:28 +00:00
Nur Izzati Zulkifli cec14ddf7e Merge branch 'amir_dev' into 'main'
merge amir_dev

See merge request online-sistem1/lelong!172
2022-08-21 02:07:19 +00:00
Amirah22 c442542515 update slip serahan 2022-08-21 10:04:49 +08:00
Amir fdb82e9080 fix api delete, update in cart 2022-08-21 03:33:24 +08:00
Amir 8c93f80be6 fix api select senarai exclude in cart&bidRecord 2022-08-21 00:09:13 +08:00
Nur Izzati Zulkifli 615894d426 Merge branch 'nisha' into 'main'
update tak laku yg redundant

See merge request online-sistem1/lelong!171
2022-08-18 07:26:19 +00:00
nishaMuhd f5fb3daf5e update tak laku yg redundant 2022-08-18 15:24:37 +08:00
Nur Izzati Zulkifli a83c366df7 Merge branch 'amirah' into 'main'
simulasi percubaan

See merge request online-sistem1/lelong!170
2022-08-18 07:20:34 +00:00
Amirah22 3559f8275c simulasi percubaan 2022-08-18 15:19:25 +08:00
Nur Izzati Zulkifli 5c1e1226d1 Merge branch 'nisha' into 'main'
Update PembidaController.php

See merge request online-sistem1/lelong!169
2022-08-18 03:54:11 +00:00
nishaMuhd efd54f0f16 Update PembidaController.php 2022-08-18 11:48:59 +08:00
Nur Izzati Zulkifli ec842e7006 Merge branch 'amirah' into 'main'
update notis, slipserahan by user_id

See merge request online-sistem1/lelong!168
2022-08-18 02:33:10 +00:00
Amirah22 1adc1757f9 update notis, slipserahan bu user_id 2022-08-18 10:23:52 +08:00
Nur Izzati Zulkifli 0721a32a50 Merge branch 'nisha' into 'main'
update listing cwgn bidaan belum bayar

See merge request online-sistem1/lelong!167
2022-08-18 01:24:20 +00:00
nishaMuhd f241b947f1 update listing cwgn bidaan belum bayar 2022-08-18 09:20:52 +08:00
Nur Izzati Zulkifli 1675ad5390 Merge branch 'nisha' into 'main'
update list belum bayar bidaan

See merge request online-sistem1/lelong!166
2022-08-17 03:47:13 +00:00
nishaMuhd 91be42ccc2 update list belum byr bidaan 2022-08-17 11:45:57 +08:00
Nur Izzati Zulkifli 8d3f29c2d7 Merge branch 'amirah' into 'main'
laporan serahan

See merge request online-sistem1/lelong!165
2022-08-17 02:24:55 +00:00
Amirah22 65b629e755 laporan serahan 2022-08-17 10:22:42 +08:00
Nur Izzati Zulkifli ea4622d253 Merge branch 'amir_dev' into 'main'
merge api payment + export data lelong TBC

See merge request online-sistem1/lelong!164
2022-08-17 01:20:06 +00:00