Commit Graph

Select branches

Hide Pull Requests

DT-36-announcement-module

Lingges/Fix/uploadPictureInStep2User

Lingges/feature/addCancelBooking

Lingges/fixpoFormat

cief-booking-task

deployment/staging

feature/email-verification

feature/notification

fix/bank-branch

fix/billing-charge

fix/bookingtable-bankname

fix/bug

fix/download-report

fix/forgot-password

fix/importer-notification

fix/notification

fix/register-error-message

fix/slice-error

fix/uploadBankSlip

fix/uploadPicture

fix/user-responsive-page

fix/x2-status

fixAdminHomeBug

fixBugBankinSlip

fixinvoice

frontend/input-validation

frontend/making-every-admin-page-responsive

invoice

master

revert-30ee81a8

too/gitlabci

too/gitlabciTest

too/supplierbookingreport

Mono Color

• ce01a8b604 Merge branch 'fixinvoice' into 'master' omair saleh 2020-09-29 03:22:39 +00:00
• 014ca6768c Remove default 0.00 on unit_price_rmb Edmond Teh 2020-09-26 23:56:14 +08:00
• eb558230c8 remove wrong comma omair saleh 2020-09-26 21:20:25 +08:00
• 91bc8141e7 Merge branch 'fixinvoice' into 'master' omair saleh 2020-09-26 13:13:46 +00:00
• 6a67231aa2 supplier do recalculate Edmond Teh 2020-09-26 18:49:28 +08:00
• fdb52929cd commit changes before merging Edmond Teh 2020-09-26 03:13:55 +08:00
• 63410cfbc9 fix problem with ei and edo duplicate Edmond Teh 2020-09-26 02:45:54 +08:00
• 8539110359 add new fields into pdf Edmond Teh 2020-09-26 01:27:59 +08:00
• 56f288e05c validate total and save Edmond Teh 2020-09-25 18:54:45 +08:00
• 3bb6587399 validation for adjustment in controller Edmond Teh 2020-09-25 18:37:17 +08:00
• b99e88187a put adjustment into formData Edmond Teh 2020-09-25 18:34:55 +08:00
• e616689ef1 add adjustment to frontend Edmond Teh 2020-09-25 18:26:27 +08:00
• f8d1cf7fd5 show old invoices omair saleh 2020-09-25 18:15:37 +08:00
• ad2203e18a show old invoices omair saleh 2020-09-25 18:13:51 +08:00
• d018bee90e show old invoices omair saleh 2020-09-25 18:12:39 +08:00
• c0fbb748ae show old invoices omair saleh 2020-09-25 18:09:10 +08:00
• 64287b183c show old invoices omair saleh 2020-09-25 18:08:34 +08:00
• 658c90e5ff show old invoices omair saleh 2020-09-25 18:06:46 +08:00
• aeae631dbb show old invoices omair saleh 2020-09-25 18:06:01 +08:00
• f2cf3b6f49 show old invoices omair saleh 2020-09-25 18:01:07 +08:00
• 899a51cafa show old invoices omair saleh 2020-09-25 18:00:05 +08:00
• 94d9cada0e show old invoices omair saleh 2020-09-25 17:58:23 +08:00
• 515badf8e4 show old invoices omair saleh 2020-09-25 17:55:38 +08:00
• 1dea589c87 show old invoices omair saleh 2020-09-25 17:32:58 +08:00
• f56a031b94 show old invoices omair saleh 2020-09-25 17:32:29 +08:00
• 41f81b5e05 show old invoices omair saleh 2020-09-25 17:29:26 +08:00
• a2170ea845 show old invoices omair saleh 2020-09-25 17:26:55 +08:00
• af66074c9a show old invoices omair saleh 2020-09-25 17:24:21 +08:00
• e71340c5dd show old invoices omair saleh 2020-09-25 17:23:11 +08:00
• d50fae2bbc show old invoices omair saleh 2020-09-25 17:22:26 +08:00
• 785540d60c show old invoices omair saleh 2020-09-25 17:18:07 +08:00
• 4e822437b1 show old invoices omair saleh 2020-09-25 17:14:50 +08:00
• 81eecaa57f show old invoices omair saleh 2020-09-25 17:14:06 +08:00
• de139c4182 show old invoices omair saleh 2020-09-25 17:09:29 +08:00
• a21ab1f874 show old invoices omair saleh 2020-09-25 17:08:33 +08:00
• a61748eb8f fix to clear js cache for app.js omair saleh 2020-09-25 16:51:47 +08:00
• b823152a51 save service_charge and billing_charge to bookings Edmond Teh 2020-09-25 16:44:37 +08:00
• 55aa5e3d91 fix to clear js cache for app.js omair saleh 2020-09-25 16:34:55 +08:00
• a3a6ee1f94 add booking_charge to booking table Edmond Teh 2020-09-25 16:26:38 +08:00
• eac4336774 add adjustment row in new invoice Edmond Teh 2020-09-25 16:04:02 +08:00
• 82e72bfc6d removed utils. not using dompdf Edmond Teh 2020-09-25 16:01:18 +08:00
• 44096eb29c fix invoices documentation Edmond Teh 2020-09-25 15:59:41 +08:00
• c51a8d6e25 service_charge fillable in booking model Edmond Teh 2020-09-25 15:57:13 +08:00
• 30b3f7554e adjustment fillable in invoice model Edmond Teh 2020-09-25 15:55:27 +08:00
• 837d37b395 add adjustment to invoices Edmond Teh 2020-09-25 15:52:25 +08:00
• 810084609b add service_charge to bookings Edmond Teh 2020-09-23 22:09:36 +08:00
• 11506bb857 validate total to bia instead of total in editPO Edmond Teh 2020-09-23 22:09:36 +08:00
• dfe55cc6f9 removed amount from props Edmond Teh 2020-09-23 22:08:20 +08:00
• d23ccc6fa5 fix total equal bia omair saleh 2020-09-23 15:14:22 +08:00
• a4d597f7f1 fix total equal bia omair saleh 2020-09-23 15:13:47 +08:00
• c65049b227 fix total equal bia omair saleh 2020-09-23 15:10:27 +08:00
• 900a307ac5 fix total equal bia omair saleh 2020-09-23 15:01:28 +08:00
• 0680e99524 fix bug with updating booking status to complete uppon invoice approval omair saleh 2020-09-23 14:56:53 +08:00
• 56282add06 change invoice total validation from rmb to rm omair saleh 2020-09-23 14:53:27 +08:00
• db7679cc16 change invoice total validation from rmb to rm omair saleh 2020-09-23 14:48:39 +08:00
• 212f4f8638 show booking details, bank slip, and china bankslip in the po step for both admin and user omair saleh 2020-09-22 10:22:58 +08:00
• c66c352921 change company details to nullable omair saleh 2020-09-22 10:08:00 +08:00
• 2867256032 fixed switched total validation from amount to bank in amount omair saleh 2020-09-21 14:44:25 +08:00
• b1f82d43bd fixed switched total validation from amount to bank in amount omair saleh 2020-09-21 14:41:57 +08:00
• b733b36a86 fixed switched total validation from amount to bank in amount omair saleh 2020-09-21 14:34:23 +08:00
• a8ddf6180b fixed switched total validation from amount to bank in amount omair saleh 2020-09-21 14:02:34 +08:00
• 396cb165b0 fixed switched formula for exchange rate from rmb to myr omair saleh 2020-09-21 13:31:10 +08:00
• 56ff8696f3 Merge branch 'invoice' into 'master' omair saleh 2020-09-18 08:48:53 +00:00
• 89aa793035 Merge remote-tracking branch 'origin/master' omair saleh 2020-09-15 13:06:41 +08:00
• 86edd907f4 fixed bank details not showing bug omair saleh 2020-09-15 13:05:19 +08:00
• d829649999 remove unused route invoice Edmond Teh 2020-09-14 18:02:49 +08:00
• 0f721e2193 remove duplicate migration file Edmond Teh 2020-09-14 17:58:37 +08:00
• b6d6db1a5b security validation for Invoice Controller Edmond Teh 2020-09-14 17:56:42 +08:00
• f7f62fb677 po Edmond Teh 2020-09-14 17:12:19 +08:00
• 75bb7d0d9c description nullable migration file Edmond Teh 2020-09-14 15:33:52 +08:00
• b53d619434 allow empty description in invoice Edmond Teh 2020-09-14 15:33:04 +08:00
• 56f9ce4348 add ei and edo field to invoices Edmond Teh 2020-09-14 13:43:54 +08:00
• 5821fd2f57 format documents with letterhead Edmond Teh 2020-09-14 13:11:51 +08:00
• d69e3384ff installed chinese fonts Edmond Teh 2020-09-10 00:32:23 +08:00
• 4f313b9e72 before cief to customer do Edmond Teh 2020-09-09 18:31:22 +08:00
• 3c204baee9 chinese encoding Edmond Teh 2020-09-09 13:14:36 +08:00
• fb70812aeb add reg_no Edmond Teh 2020-09-07 03:12:49 +08:00
• 3e04391342 supplier do Edmond Teh 2020-09-07 02:35:36 +08:00
• 48a9a20462 customer do and po Edmond Teh 2020-09-07 01:54:21 +08:00
• f7b9d07f8c installed DomPDF Edmond Teh 2020-09-06 22:20:45 +08:00
• a8125eaab4 validate getPO Edmond Teh 2020-09-06 21:29:13 +08:00
• a417404260 get PO from api Edmond Teh 2020-09-06 21:29:01 +08:00
• 3c6aac61a7 change link to download button Edmond Teh 2020-09-06 16:51:02 +08:00
• 2b0e108ce5 Download PO and DO Link Edmond Teh 2020-09-06 16:37:12 +08:00
• 8c0f13c652 fix linting error booking/completed Edmond Teh 2020-09-06 16:17:29 +08:00
• ef156ecde4 update status to 7 on approve Edmond Teh 2020-09-06 16:07:45 +08:00
• 96a08b6839 submit and request changes Edmond Teh 2020-09-06 15:52:30 +08:00
• 3c22efe880 Edit Invoice frontend Edmond Teh 2020-09-04 16:44:12 +08:00
• 269eaf0218 post comment and default to pending on create inv Edmond Teh 2020-09-04 15:26:05 +08:00
• 6660ff9c6c routes to post comment Edmond Teh 2020-09-04 15:25:28 +08:00
• fb38cee6bb make comment nullable Edmond Teh 2020-09-04 15:25:08 +08:00
• 3d2dec4699 getTotal when show invoice Edmond Teh 2020-09-04 12:36:12 +08:00
• 914a38ac35 admin vif new-invoice Edmond Teh 2020-09-04 12:35:50 +08:00
• c20d435e00 pending in title Edmond Teh 2020-09-04 12:12:04 +08:00
• 7aa52e784a create and show controller Edmond Teh 2020-09-03 16:04:45 +08:00
• 7692f45332 create invoice controller Edmond Teh 2020-09-03 13:41:19 +08:00
• 6c5259ceb2 frontend create invoice Edmond Teh 2020-09-03 13:41:12 +08:00
• 5e66f246d6 Add invoice_id Edmond Teh 2020-09-03 12:48:41 +08:00
• 1de3cc763e InvoiceStatuses Model Edmond Teh 2020-09-03 12:47:08 +08:00
• a7a0bc7374 Model for InvoiceDetails Edmond Teh 2020-09-03 12:42:58 +08:00