Commit Graph

347 Commits

Author SHA1 Message Date
prashant-webkul b33d7c1aa1 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
Countries and States list component to be devised for system wide usage.
2018-10-12 18:24:58 +05:30
JItendra Singh 3214e71438
Merge pull request #51 from bagisto/jitendra
Countries and States models added
2018-10-12 18:24:50 +05:30
prashant-webkul a7e813ff0d Before merge 2018-10-12 18:24:13 +05:30
jitendra 1e16931ba3 Countries and States models added 2018-10-12 18:24:10 +05:30
prashant-webkul 676aeb3217 UI and System fixes 2018-10-12 16:45:55 +05:30
JItendra Singh f750690e4d
Merge pull request #50 from bagisto/prashant
Prashant
2018-10-12 14:44:29 +05:30
prashant-webkul 7319a8c40a Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 13:53:22 +05:30
JItendra Singh 26549e842c
Merge pull request #49 from bagisto/jitendra
Performence Optimized
2018-10-12 13:53:13 +05:30
prashant-webkul 0c47cbc282 Bug fixes 2018-10-12 13:52:21 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
prashant-webkul a631a07674 Bug fixes and cart operations optimization 2018-10-12 12:51:39 +05:30
prashant-webkul 9df49c07d3 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 09:55:48 +05:30
prashant-webkul f28f716d9f Bug fixes across the system 2018-10-11 19:55:59 +05:30
prashant-webkul 2378d2bdd2 layout changes 2018-10-11 15:22:25 +05:30
JItendra Singh 7a7e25b11d
Merge pull request #48 from bagisto/jitendra
Tax calculation
2018-10-11 11:43:49 +05:30
jitendra 1b06082e2e Tax calculation 2018-10-11 11:42:39 +05:30
JItendra Singh 076e5191b2
Merge pull request #47 from bagisto/prashant
Prashant
2018-10-11 11:42:36 +05:30
prashant-webkul 60c930c401 Merged w/ master 2018-10-11 11:12:17 +05:30
JItendra Singh 7b461564c4
Merge pull request #46 from bagisto/jitendra
Refactor cart
2018-10-11 11:10:14 +05:30
jitendra 392ceadf53 Refactor cart 2018-10-11 11:09:17 +05:30
prashant-webkul d26758e49a Merged 2018-10-10 16:13:51 +05:30
prashant-webkul 34d4a1c3a4 Before Merge 2018-10-10 16:11:33 +05:30
JItendra Singh 5770736ee7
Merge pull request #45 from bagisto/jitendra
Fixed cart issues
2018-10-10 15:57:36 +05:30
jitendra 6f57a51152 Fixed cart issues 2018-10-10 15:56:27 +05:30
JItendra Singh 503f0e0a5a
Merge pull request #44 from bagisto/jitendra
Home new products
2018-10-10 11:22:19 +05:30
JItendra Singh 0178aef225
Merge pull request #43 from bagisto/rahul
Rahul
2018-10-10 11:21:59 +05:30
jitendra 426933a4bb Home new products 2018-10-10 11:20:47 +05:30
rahul shukla cf02c148a8 removing conflict 2018-10-10 11:18:45 +05:30
rahul shukla 17f133ca07 removing offerzone 2018-10-10 11:16:18 +05:30
rahul shukla bb92be967b product responsive & loader 2018-10-10 11:08:19 +05:30
prashant-webkul b6df4e1dc8 Merged with master 2018-10-10 10:19:30 +05:30
prashant-webkul 36102ac040 Bug fixes in tax rate and categories 2018-10-09 17:34:25 +05:30
JItendra Singh 58a461d2bc
Merge pull request #42 from bagisto/jitendra
Shipment and invoice creation completed
2018-10-09 17:33:33 +05:30
jitendra d00bb078a1 Shipment and invoice creation completed 2018-10-09 17:32:22 +05:30
rahul shukla e887b27e7d nav-responsive 2018-10-08 13:46:17 +05:30
rahul shukla 79a4c85a1a conflict 2018-10-08 10:07:51 +05:30
rahul shukla 05a4f84882 conflict 2018-10-08 10:01:17 +05:30
rahul shukla c1d73dfb32 responsive 2018-10-06 15:04:23 +05:30
JItendra Singh 3d92544aad
Merge pull request #41 from bagisto/prashant
Prashant
2018-10-05 18:03:20 +05:30
prashant-webkul 301eb1959f merged with master 2018-10-05 17:38:42 +05:30
prashant-webkul 70da40c855 Before merge wishlist in progress 2018-10-05 17:30:48 +05:30
JItendra Singh 0daee318b3
Merge pull request #40 from bagisto/jitendra
Order creation completed
2018-10-05 17:30:45 +05:30
jitendra f87a47d798 Order creation completed 2018-10-05 17:29:43 +05:30
JItendra Singh 7124bc22d0
Merge pull request #39 from bagisto/prashant
Prashant
2018-10-05 11:53:59 +05:30
prashant-webkul 0177d889c3 Merged with master 2018-10-05 11:53:00 +05:30
JItendra Singh 3666606e14
Merge pull request #38 from bagisto/jitendra
Order create
2018-10-05 11:50:05 +05:30
prashant-webkul c9da9491a6 Before merge 2018-10-05 11:49:30 +05:30
jitendra a9106e0486 Order create 2018-10-05 11:48:58 +05:30
prashant-webkul e86d78dc3f Wishlist Started to be done as an universal component 2018-10-04 20:28:38 +05:30
prashant-webkul adc7052afa Cart Dependency Resolved From Composer to Global helpers and removed the form field check for the cart operations of add, remove and update 2018-10-04 19:46:23 +05:30