diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c0eb019b..2ae0c065 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -56,7 +56,7 @@
     "/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=d10dd00193bb29222ec7",
     "/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=a95ccce067bd07bd73ac",
     "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=c092e8eebdde4a9a1aad",
-    "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=402eab890971aa857ea5",
+    "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=7dc45b850190d3880f37",
     "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=a622e568efb24e955520",
     "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=94f783e4d95215ff00a1",
     "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=a53a01abf7a98a9c2d15",
@@ -269,5 +269,117 @@
     "/chunks/user-password.6067f5711da4d2057b5d.hot-update.js": "/chunks/user-password.6067f5711da4d2057b5d.hot-update.js",
     "/chunks/user-storage.6067f5711da4d2057b5d.hot-update.js": "/chunks/user-storage.6067f5711da4d2057b5d.hot-update.js",
     "/chunks/admin~chunks/oasis/invoices~chunks/platform.5d8913fde8489068450e.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.5d8913fde8489068450e.hot-update.js",
-    "/chunks/admin~chunks/oasis/invoices~chunks/platform.9a741df08301e2e291d1.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.9a741df08301e2e291d1.hot-update.js"
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.9a741df08301e2e291d1.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.9a741df08301e2e291d1.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.15d2f33b6990faac3cef.hot-update.js": "/chunks/oasis/invoices/create-invoice.15d2f33b6990faac3cef.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.5e6c143a6942778908c9.hot-update.js": "/chunks/oasis/invoices/create-invoice.5e6c143a6942778908c9.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.63a380184daebe46a5cb.hot-update.js": "/chunks/oasis/invoices/create-invoice.63a380184daebe46a5cb.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.92b9b1e1df1d170c5e69.hot-update.js": "/chunks/oasis/invoices/create-invoice.92b9b1e1df1d170c5e69.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.4a71e7b405dd22f21611.hot-update.js": "/chunks/oasis/invoices/create-invoice.4a71e7b405dd22f21611.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.92db6582e0894f6ddd67.hot-update.js": "/chunks/oasis/invoices/create-invoice.92db6582e0894f6ddd67.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.249572fca00ec4668a8f.hot-update.js": "/chunks/oasis/invoices/create-invoice.249572fca00ec4668a8f.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.1df20f6b025a1ed8c805.hot-update.js": "/chunks/oasis/invoices/create-invoice.1df20f6b025a1ed8c805.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e8a9f81d850616d113b1.hot-update.js": "/chunks/oasis/invoices/create-invoice.e8a9f81d850616d113b1.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.07cf91b7c153469060fc.hot-update.js": "/chunks/oasis/invoices/create-invoice.07cf91b7c153469060fc.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e655cc8225cb3e35e12e.hot-update.js": "/chunks/oasis/invoices/create-invoice.e655cc8225cb3e35e12e.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.d2f7f17c87364ed850bb.hot-update.js": "/chunks/oasis/invoices/create-invoice.d2f7f17c87364ed850bb.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.692673907a818f385019.hot-update.js": "/chunks/oasis/invoices/create-invoice.692673907a818f385019.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.a5d572e2b634b2826897.hot-update.js": "/chunks/oasis/invoices/create-invoice.a5d572e2b634b2826897.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.adf4ca9af85c4dd55442.hot-update.js": "/chunks/oasis/invoices/create-invoice.adf4ca9af85c4dd55442.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.ca63ba431a0180e65438.hot-update.js": "/chunks/oasis/invoices/create-invoice.ca63ba431a0180e65438.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.01f9d171b1a43246f36e.hot-update.js": "/chunks/oasis/invoices/create-invoice.01f9d171b1a43246f36e.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.0927a3c6a2adf95f3d64.hot-update.js": "/chunks/oasis/invoices/create-invoice.0927a3c6a2adf95f3d64.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.d5837c837bbebcb91f9a.hot-update.js": "/chunks/oasis/invoices/create-invoice.d5837c837bbebcb91f9a.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.84cbab59d70635e99801.hot-update.js": "/chunks/oasis/invoices/create-invoice.84cbab59d70635e99801.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.107386a76e214449b11e.hot-update.js": "/chunks/oasis/invoices/create-invoice.107386a76e214449b11e.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.3aad8617b5c531eff3cb.hot-update.js": "/chunks/oasis/invoices/create-invoice.3aad8617b5c531eff3cb.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.bcc283b94f200ee41956.hot-update.js": "/chunks/oasis/invoices/create-invoice.bcc283b94f200ee41956.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.8258c03893460bf7d977.hot-update.js": "/chunks/oasis/invoices/create-invoice.8258c03893460bf7d977.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.c81f5215b0ab59272e2e.hot-update.js": "/chunks/oasis/invoices/create-invoice.c81f5215b0ab59272e2e.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.6b97bcd0ce44e63cb4ca.hot-update.js": "/chunks/oasis/invoices/create-invoice.6b97bcd0ce44e63cb4ca.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.7b226ee3a98705f3f247.hot-update.js": "/chunks/oasis/invoices/create-invoice.7b226ee3a98705f3f247.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.2554ba4f2905e8ec6a42.hot-update.js": "/chunks/oasis/invoices/create-invoice.2554ba4f2905e8ec6a42.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.a1f4157536ca66bcb6b5.hot-update.js": "/chunks/oasis/invoices/create-invoice.a1f4157536ca66bcb6b5.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.328453d1e6eeea1fa4fd.hot-update.js": "/chunks/oasis/invoices/create-invoice.328453d1e6eeea1fa4fd.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.585d5ed14cef7b033f1c.hot-update.js": "/chunks/oasis/invoices/create-invoice.585d5ed14cef7b033f1c.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.810618aedaa5d7020a89.hot-update.js": "/chunks/oasis/invoices/create-invoice.810618aedaa5d7020a89.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.1c758b897857d9d9af6a.hot-update.js": "/chunks/oasis/invoices/create-invoice.1c758b897857d9d9af6a.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.8b6b81723b4d423af36b.hot-update.js": "/chunks/oasis/invoices/create-invoice.8b6b81723b4d423af36b.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.b315c372b4b3a28cec11.hot-update.js": "/chunks/oasis/invoices/create-invoice.b315c372b4b3a28cec11.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.ea0b8a549f3cab6e4439.hot-update.js": "/chunks/oasis/invoices/create-invoice.ea0b8a549f3cab6e4439.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e43ebe09299e209d4864.hot-update.js": "/chunks/oasis/invoices/create-invoice.e43ebe09299e209d4864.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.1db20bf3a6564c44bf90.hot-update.js": "/chunks/oasis/invoices/create-invoice.1db20bf3a6564c44bf90.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e1800a5a8ce340c15683.hot-update.js": "/chunks/oasis/invoices/create-invoice.e1800a5a8ce340c15683.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.74fc74dab528d8b82bf5.hot-update.js": "/chunks/oasis/invoices/create-invoice.74fc74dab528d8b82bf5.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.96c8f38bbc5e43d2fb06.hot-update.js": "/chunks/oasis/invoices/create-invoice.96c8f38bbc5e43d2fb06.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.84f703f6101cbff3e6e9.hot-update.js": "/chunks/oasis/invoices/create-invoice.84f703f6101cbff3e6e9.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.a92a99fd2f39a73f0783.hot-update.js": "/chunks/oasis/invoices/create-invoice.a92a99fd2f39a73f0783.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.d433fcde34f2f8dd4382.hot-update.js": "/chunks/oasis/invoices/create-invoice.d433fcde34f2f8dd4382.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.7a7ca71ab417fd218a06.hot-update.js": "/chunks/oasis/invoices/create-invoice.7a7ca71ab417fd218a06.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.8ea88d6171207798a820.hot-update.js": "/chunks/oasis/invoices/create-invoice.8ea88d6171207798a820.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.5f2bcd28ea8ac2f0133a.hot-update.js": "/chunks/oasis/invoices/create-invoice.5f2bcd28ea8ac2f0133a.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.c53081a0e20baa6128d1.hot-update.js": "/chunks/oasis/invoices/create-invoice.c53081a0e20baa6128d1.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.dce0fe9372b6c19cd9eb.hot-update.js": "/chunks/oasis/invoices/create-invoice.dce0fe9372b6c19cd9eb.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.dda264ee123bb237ddee.hot-update.js": "/chunks/oasis/invoices/create-invoice.dda264ee123bb237ddee.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.7afe9ff60820c48210b1.hot-update.js": "/chunks/oasis/invoices/create-invoice.7afe9ff60820c48210b1.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.deaacc09fb97cffe3dae.hot-update.js": "/chunks/oasis/invoices/create-invoice.deaacc09fb97cffe3dae.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.621fa0325c2bce3fb2ff.hot-update.js": "/chunks/oasis/invoices/create-invoice.621fa0325c2bce3fb2ff.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e69c80e64094983ca245.hot-update.js": "/chunks/oasis/invoices/create-invoice.e69c80e64094983ca245.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.c9fd5782557295d44c45.hot-update.js": "/chunks/oasis/invoices/create-invoice.c9fd5782557295d44c45.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.c7f95d841785d053e8ea.hot-update.js": "/chunks/oasis/invoices/create-invoice.c7f95d841785d053e8ea.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.25add779f5cc50529023.hot-update.js": "/chunks/oasis/invoices/create-invoice.25add779f5cc50529023.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e96e018ac5decc2419df.hot-update.js": "/chunks/oasis/invoices/create-invoice.e96e018ac5decc2419df.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.77dc2562d41b45fee487.hot-update.js": "/chunks/oasis/invoices/create-invoice.77dc2562d41b45fee487.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.bcd626c3f8706941eb39.hot-update.js": "/chunks/oasis/invoices/create-invoice.bcd626c3f8706941eb39.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e6112dc883cb02472427.hot-update.js": "/chunks/oasis/invoices/create-invoice.e6112dc883cb02472427.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.d52de50c5a7c014a56e3.hot-update.js": "/chunks/oasis/invoices/create-invoice.d52de50c5a7c014a56e3.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.3c77fdbdb206f4e9787a.hot-update.js": "/chunks/oasis/invoices/create-invoice.3c77fdbdb206f4e9787a.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.645a842a02afa962c3df.hot-update.js": "/chunks/oasis/invoices/create-invoice.645a842a02afa962c3df.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.f29e7c2d41194194ad7b.hot-update.js": "/chunks/oasis/invoices/create-invoice.f29e7c2d41194194ad7b.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.17f3c6fabb2127ab39dc.hot-update.js": "/chunks/oasis/invoices/create-invoice.17f3c6fabb2127ab39dc.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.b542efd13bd94593393c.hot-update.js": "/chunks/oasis/invoices/create-invoice.b542efd13bd94593393c.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.74c5c70e44f88d8bf2b0.hot-update.js": "/chunks/oasis/invoices/create-invoice.74c5c70e44f88d8bf2b0.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.9235889c143ecf19e8ad.hot-update.js": "/chunks/oasis/invoices/create-invoice.9235889c143ecf19e8ad.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.84ea836199cc8e04a305.hot-update.js": "/chunks/oasis/invoices/create-invoice.84ea836199cc8e04a305.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.91b26cbf2385e3cc6fcd.hot-update.js": "/chunks/oasis/invoices/create-invoice.91b26cbf2385e3cc6fcd.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.0a0f580b348c96fa8984.hot-update.js": "/chunks/oasis/invoices/create-invoice.0a0f580b348c96fa8984.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.607953fb9ff8a90681f7.hot-update.js": "/chunks/oasis/invoices/create-invoice.607953fb9ff8a90681f7.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.de0ceda85b6b00f52f52.hot-update.js": "/chunks/oasis/invoices/create-invoice.de0ceda85b6b00f52f52.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.7263fb96f54dc1ef4de3.hot-update.js": "/chunks/oasis/invoices/create-invoice.7263fb96f54dc1ef4de3.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.88918abd3f63c54166c8.hot-update.js": "/chunks/oasis/invoices/create-invoice.88918abd3f63c54166c8.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.a244cc8ab9a7f4d8e9ae.hot-update.js": "/chunks/oasis/invoices/create-invoice.a244cc8ab9a7f4d8e9ae.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.9a559a186b77b925f583.hot-update.js": "/chunks/oasis/invoices/create-invoice.9a559a186b77b925f583.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e8bdc9e8318a3b10e564.hot-update.js": "/chunks/oasis/invoices/create-invoice.e8bdc9e8318a3b10e564.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.ab3001a18eeb5b304dec.hot-update.js": "/chunks/oasis/invoices/create-invoice.ab3001a18eeb5b304dec.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.3dbbc3df4b816a7d5502.hot-update.js": "/chunks/oasis/invoices/create-invoice.3dbbc3df4b816a7d5502.hot-update.js",
+    "/js/main.a64da284fb652b40aca8.hot-update.js": "/js/main.a64da284fb652b40aca8.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~30c3eb1b.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~30c3eb1b.js?id=d47268e349bd2772cd71",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~b2b17caf.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~b2b17caf.js?id=55d2b5e5a0fdda04fe42",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~2e1d0044.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~2e1d0044.js?id=15bd59d080c7feb21c94",
+    "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~e9fdda75.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~e9fdda75.js?id=62ce022b3544cd69a5bd",
+    "/chunks/oasis/invoices/create-invoice.a64da284fb652b40aca8.hot-update.js": "/chunks/oasis/invoices/create-invoice.a64da284fb652b40aca8.hot-update.js",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~031a0bf8.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~031a0bf8.js?id=e5355666d39ae3c90ece",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~6b50d93b.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~6b50d93b.js?id=bcb779faea92dfb55517",
+    "/js/main.4873f8c3a28e1dc0dc6b.hot-update.js": "/js/main.4873f8c3a28e1dc0dc6b.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.4873f8c3a28e1dc0dc6b.hot-update.js": "/chunks/oasis/invoices/create-invoice.4873f8c3a28e1dc0dc6b.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.7b4b7227ea0d3025501f.hot-update.js": "/chunks/oasis/invoices/create-invoice.7b4b7227ea0d3025501f.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.1b7a2223a5f46e35dd61.hot-update.js": "/chunks/oasis/invoices/create-invoice.1b7a2223a5f46e35dd61.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.78e1e63d89029bdaade8.hot-update.js": "/chunks/oasis/invoices/create-invoice.78e1e63d89029bdaade8.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.2875f6dd813536c5cffb.hot-update.js": "/chunks/oasis/invoices/create-invoice.2875f6dd813536c5cffb.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.64f03fa02e6628038b16.hot-update.js": "/chunks/oasis/invoices/create-invoice.64f03fa02e6628038b16.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.df89ad326cfb6e0eb821.hot-update.js": "/chunks/oasis/invoices/create-invoice.df89ad326cfb6e0eb821.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.2e0834f26024008235ef.hot-update.js": "/chunks/oasis/invoices/create-invoice.2e0834f26024008235ef.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.42389a93c03c29044393.hot-update.js": "/chunks/oasis/invoices/create-invoice.42389a93c03c29044393.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.190158eb943c13baa350.hot-update.js": "/chunks/oasis/invoices/create-invoice.190158eb943c13baa350.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.f5fa6d86f3808858b8b9.hot-update.js": "/chunks/oasis/invoices/create-invoice.f5fa6d86f3808858b8b9.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.e25d2f252fd5c670e17f.hot-update.js": "/chunks/oasis/invoices/create-invoice.e25d2f252fd5c670e17f.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.231ccf5c595cd4f5a74a.hot-update.js": "/chunks/oasis/invoices/create-invoice.231ccf5c595cd4f5a74a.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.59ef634503d5a94ccef5.hot-update.js": "/chunks/oasis/invoices/create-invoice.59ef634503d5a94ccef5.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.5f9d04446d922dc5956c.hot-update.js": "/chunks/oasis/invoices/create-invoice.5f9d04446d922dc5956c.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.b967359aa87978426664.hot-update.js": "/chunks/oasis/invoices/create-invoice.b967359aa87978426664.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.eca056eb7735e17406a8.hot-update.js": "/chunks/oasis/invoices/create-invoice.eca056eb7735e17406a8.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.1231b5177cdf51239077.hot-update.js": "/chunks/oasis/invoices/create-invoice.1231b5177cdf51239077.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.55753e07146337bc85aa.hot-update.js": "/chunks/oasis/invoices/create-invoice.55753e07146337bc85aa.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.f23ba6ba9a8ebcd94d1c.hot-update.js": "/chunks/oasis/invoices/create-invoice.f23ba6ba9a8ebcd94d1c.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.133c9452e3f3b963f4b8.hot-update.js": "/chunks/oasis/invoices/create-invoice.133c9452e3f3b963f4b8.hot-update.js",
+    "/chunks/oasis/invoices/create-invoice.18147e2594153da4071c.hot-update.js": "/chunks/oasis/invoices/create-invoice.18147e2594153da4071c.hot-update.js"
 }
diff --git a/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue b/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
index d29efb2f..e63ae2f4 100644
--- a/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
+++ b/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
@@ -3,10 +3,58 @@
 		<MobileHeader :title="pageTitle" />
 		<PageHeader :title="pageTitle" />
 
-		<div id="page-content" class="medium-width">
-			<div class="content-page">
-				<ValidationObserver @submit.prevent="createInvoice" ref="createInvoice" v-slot="{ invalid }" tag="form" class="form block-form">
+		<div id="page-content">
+			<div class="content-page order">
+				<ValidationObserver @submit.prevent="createInvoice" ref="createInvoice" v-slot="{ invalid }" tag="form" class="steps form block-form">
 					<PageTab>
+						<PageTabGroup>
+							<FormLabel icon="edit">Items</FormLabel>
+
+							<div class="duplicator">
+								<div class="plan-item duplicator-item" v-for="(item, index) in invoice.items" :key="index++">
+									<x-icon @click="removeRow(item)" v-if="index !== 0" size="22" class="delete-item hover-text-theme" />
+
+									<div class="block-wrapper">
+										<label>Description:</label>
+										<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="description" rules="required" v-slot="{ errors }">
+											<input v-model="item.description" placeholder="Type item description..." type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+											<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+										</ValidationProvider>
+									</div>
+
+									<div class="wrapper-inline">
+										<div class="block-wrapper">
+											<label>Amount:</label>
+											<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="amount" rules="required" v-slot="{ errors }">
+												<input v-model.number="item.amount" placeholder="The amount in Pcs." type="number" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+												<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+											</ValidationProvider>
+										</div>
+
+										<div v-if="isVatPayer" class="block-wrapper">
+											<label>Tax Rate:</label>
+											<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="tax_rate" rules="required" v-slot="{ errors }">
+												<input v-model.number="item.tax_rate" placeholder="Type item tax rate in %..." type="number" step="1" min="1" max="100" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+												<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+											</ValidationProvider>
+										</div>
+
+										<div class="block-wrapper">
+											<label>Price:</label>
+											<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="price" rules="required" v-slot="{ errors }">
+												<input v-model.number="item.price" placeholder="Type the item price..." type="number" step="0.01" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+												<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+											</ValidationProvider>
+										</div>
+									</div>
+								</div>
+
+								<ButtonBase @click.native="addRow" class="duplicator-add-button" button-style="theme" style="width: 100%">
+									Add New Item
+								</ButtonBase>
+							</div>
+						</PageTabGroup>
+
 						<PageTabGroup>
 							<FormLabel icon="tool">Invoice Properties</FormLabel>
 
@@ -142,54 +190,6 @@
 							</div>
 						</PageTabGroup>
 
-						<PageTabGroup>
-							<FormLabel icon="edit">Items</FormLabel>
-
-							<div class="duplicator">
-								<div class="plan-item duplicator-item" v-for="(item, index) in invoice.items" :key="index++">
-									<x-icon @click="removeRow(item)" v-if="index !== 0" size="22" class="delete-item hover-text-theme" />
-
-									<div class="block-wrapper">
-										<label>Description:</label>
-										<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="description" rules="required" v-slot="{ errors }">
-											<input v-model="item.description" placeholder="Type item description..." type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
-											<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-										</ValidationProvider>
-									</div>
-
-									<div class="wrapper-inline">
-										<div class="block-wrapper">
-											<label>Amount:</label>
-											<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="amount" rules="required" v-slot="{ errors }">
-												<input v-model.number="item.amount" placeholder="The amount in Pcs." type="number" :class="{'is-error': errors[0]}" class="focus-border-theme" />
-												<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-											</ValidationProvider>
-										</div>
-
-										<div v-if="isVatPayer" class="block-wrapper">
-											<label>Tax Rate:</label>
-											<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="tax_rate" rules="required" v-slot="{ errors }">
-												<input v-model.number="item.tax_rate" placeholder="Type item tax rate in %..." type="number" step="1" min="1" max="100" :class="{'is-error': errors[0]}" class="focus-border-theme" />
-												<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-											</ValidationProvider>
-										</div>
-
-										<div class="block-wrapper">
-											<label>Price:</label>
-											<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="price" rules="required" v-slot="{ errors }">
-												<input v-model.number="item.price" placeholder="Type the item price..." type="number" step="0.01" :class="{'is-error': errors[0]}" class="focus-border-theme" />
-												<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-											</ValidationProvider>
-										</div>
-									</div>
-								</div>
-
-								<ButtonBase @click.native="addRow" class="duplicator-add-button" button-style="theme">
-									Add New Item
-								</ButtonBase>
-							</div>
-						</PageTabGroup>
-
 						<PageTabGroup>
 							<FormLabel icon="credit-card">Discount</FormLabel>
 
@@ -248,15 +248,50 @@
 									</div>
 								</ValidationProvider>
 							</div>
-
-							<div class="block-wrapper">
-								<ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit">
-									Store & Generate Invoice
-								</ButtonBase>
-							</div>
 						</PageTabGroup>
 					</PageTab>
 				</ValidationObserver>
+				<div class="summary">
+					<FormLabel icon="credit-card">Invoice Summary</FormLabel>
+					<div class="summary-list" :class="{'is-error': isError}">
+
+						<div v-for="(tax, i) in taxBased" :key="i" class="row small">
+							<div class="cell">
+								<span>Základ DPH {{ tax.rate }}%</span>
+							</div>
+							<div class="cell">
+								<span>{{ formatNumber(tax.total) }}</span>
+							</div>
+						</div>
+
+						<div :class="{'is-offset': taxSummary.length > 1}">
+							<div v-for="(tax, i) in taxSummary" :key="i" class="row small">
+								<div class="cell">
+									<span>DPH {{ tax.rate }}%</span>
+								</div>
+								<div class="cell">
+									<span>{{ formatNumber(tax.total) }}</span>
+								</div>
+							</div>
+						</div>
+
+						<div class="row row-summary">
+							<div class="cell">
+								<b>Spolu</b>
+							</div>
+							<div class="cell">
+								<b>{{ formatNumber(total) }}</b>
+							</div>
+						</div>
+
+						<ButtonBase :disabled="isLoading" :loading="isLoading" @click.native="createInvoice" button-style="theme-solid" class="next-submit">
+							Store & Generate Invoice
+						</ButtonBase>
+						<p class="error-message" v-if="isError">
+							{{ errorMessage }}
+						</p>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -312,6 +347,74 @@
 			isNewClient() {
 				return this.invoice.client === 'new-client'
 			},
+			taxBased() {
+				let bag = [];
+
+				this.invoice.items.forEach(item => {
+
+					if (item.price && item.amount && item.tax_rate) {
+
+						if (! bag.find(bagItem => bagItem.rate === item.tax_rate)) {
+
+							bag.push({
+								rate: item.tax_rate,
+								total: (item.price * item.amount),
+							})
+						} else {
+							bag.find(bagItem => {
+								if (bagItem.rate === item.tax_rate)
+									bagItem.total += (item.price * item.amount)
+							})
+						}
+					}
+				})
+
+				return bag
+			},
+			taxSummary() {
+				let bag = [];
+
+				this.invoice.items.forEach(item => {
+
+					if (item.price && item.amount && item.tax_rate) {
+
+						if (! bag.find(bagItem => bagItem.rate === item.tax_rate)) {
+
+							bag.push({
+								rate: item.tax_rate,
+								total: (item.price * item.amount) * (item.tax_rate / 100),
+							})
+
+						} else {
+
+							bag.find(bagItem => {
+								if (bagItem.rate === item.tax_rate)
+									bagItem.total += (item.price * item.amount) * (item.tax_rate / 100)
+							})
+						}
+					}
+				})
+
+				return bag
+			},
+			total() {
+				let total = 0;
+
+				this.invoice.items.forEach(item => {
+					if (item.price && item.amount) {
+
+						let total_without_tax = (item.price * item.amount)
+
+						if (item.tax_rate) {
+							total_without_tax += total_without_tax * (item.tax_rate / 100)
+						}
+
+						total += total_without_tax
+					}
+				})
+
+				return total
+			}
 		},
 		watch: {
 			isDiscount(val) {
@@ -414,6 +517,9 @@
 			}
 		},
 		methods: {
+			formatNumber(value) {
+				return (Math.round(value * 100) / 100).toFixed(2);
+			},
 			async createInvoice() {
 
 				const isValid = await this.$refs.createInvoice.validate();
@@ -484,8 +590,8 @@
 					id: Math.floor(Math.random() * 10000000),
 					description: '',
 					amount: 1,
-					tax_rate: 0,
-					price: undefined,
+					tax_rate: 12,
+					price: 10,
 				})
 			},
 			removeRow(item) {
@@ -520,4 +626,100 @@
     @import '@assets/vuefilemanager/_variables';
 	@import '@assets/vuefilemanager/_mixins';
 	@import '@assets/vuefilemanager/_forms';
+
+	#page-content {
+		max-width: 1190px;
+	}
+
+	.order {
+		display: flex;
+		margin-bottom: 30px;
+
+		.steps {
+			flex: 0 0 65%;
+			padding-right: 30px;
+
+			.form {
+				max-width: 100%;
+			}
+		}
+
+		.summary {
+			flex: 0 0 34%;
+		}
+	}
+
+	.summary-list {
+		box-shadow: 0 7px 20px 5px hsla(220, 36%, 16%, 0.06);
+		border-radius: 8px;
+		position: sticky;
+		padding: 25px;
+		top: 85px;
+
+		&.is-error {
+			border: 2px solid $danger;
+			box-shadow: 0 7px 20px 5px rgba($danger, 0.06);
+		}
+
+		.error-message {
+			font-weight: 600;
+		}
+
+		.next-submit {
+			width: 100%;
+			margin-top: 20px;
+		}
+
+		.disclaimer {
+			@include font-size(12);
+			line-height: 1.6;
+			display: block;
+			margin-top: 12px;
+		}
+
+		.is-offset {
+			border-top: 1px solid $light_mode_border;
+			display: block;
+			padding-top: 10px;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			padding: 15px 0;
+
+			&.small {
+				padding: 0 0 10px;
+			}
+
+			&:first-child {
+				padding-top: 0;
+			}
+
+			&.row-summary {
+				border-top: 1px solid $light_mode_border;
+				padding-bottom: 0;
+
+				b {
+					font-weight: 800;
+				}
+			}
+		}
+
+		.cell {
+			b {
+				display: block;
+				@include font-size(18);
+			}
+
+			small {
+				color: $text-muted;
+				@include font-size(12);
+			}
+
+			span {
+				@include font-size(14);
+			}
+		}
+	}
 </style>