Commit Graph

243 Commits

Author SHA1 Message Date
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
Jitendra Singh 4a6ac73bb6 Improved code style 2020-02-28 15:55:53 +05:30
Herbert Maschke 6c5e9a73f9 remove unnecessary database columns in order table 2020-02-28 10:54:00 +01:00
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
Herbert Maschke 95dfe3f8d0 propagate the company_name and vat_id from address through cart to order addresses 2020-02-26 07:37:17 +01:00
Jitendra Singh 195eb82802 Replace else if with elseif 2020-02-24 17:49:12 +05:30
Jitendra Singh 7b8cf802f4 Improved sales package code style 2020-02-20 12:17:44 +05:30
MonaHartdegen 2849ddd7db added fields to order related factories 2020-02-12 09:58:50 +01:00
Annika Wolff e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring 2020-01-31 09:41:58 +01:00
Herbert Maschke 4d28188efb move factories into appropriate packages and remove redundant ones 2020-01-31 05:42:13 +01:00
Steffen Mahler 0d696c6b1a merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring 2020-01-28 15:51:50 +01:00
Steffen Mahler 14c0276fce update cart button is not shown, when only products without quantity box are in cart, tests added 2020-01-28 15:38:07 +01:00
Jitendra Singh 321dc84a91
Merge pull request #2179 from jitendra-webkul/1.0
Shipping discount issue fixed during refund creation
2020-01-28 17:37:20 +05:30
Jitendra Singh 2db836c201 Shipping discount issue fixed during refund creation 2020-01-28 17:14:37 +05:30
Herbert Maschke 511d812333 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-27 11:40:18 +01:00
rahul shukla cbaebaa388 query optimization and hide of expose model 2020-01-25 17:00:31 +05:30
Herbert Maschke e948b30e35 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-24 15:13:16 +01:00
Florian Bosdorff db00689a5c add basic backend tests 2020-01-23 13:11:47 +01:00
Herbert Maschke 4596a77c07 Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 11:36:26 +01:00
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Annika Wolff a75f3dab51 resolve conflicts 2020-01-15 11:37:38 +01:00
David Große a9f41ac73f some OrderRepository.php refactoring 2020-01-13 11:35:29 +01:00
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
Jitendra Singh 14869df230 Issue #1979 fixexd 2020-01-09 17:03:58 +05:30
Annika Wolff 9fd5ff7f47 small refactor on checks if downloadable product 2019-12-27 10:03:01 +01:00
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
jitendra 2d0b26d78a Added changes on core packages for discount 2019-12-21 13:01:16 +05:30
Annika Wolff 35fa80e91f refactoring part 2019-12-17 13:11:02 +01:00
David Große b679f543db move tests/OrderRepositoryCest.php into brand new shiny fancy codeception tests/ folder 2019-12-13 14:10:44 +01:00
Jitendra Singh 94cfc5a9d5
Merge pull request #1891 from rahulshukla-webkul/development
Issue #1848
2019-12-13 17:08:07 +05:30
rahul shukla 6af302fa95 Issue #1848 2019-12-13 17:06:32 +05:30
Annika Wolff 85d3c2b64a slackened condition to save downloadable purchase link 2019-12-12 13:39:33 +01:00
Herbert e65ef14ec1 removed type hint (int) 2019-11-22 08:49:22 +01:00
Herbert eea69a546f use ReflectionClass for unit test 2019-11-21 14:47:54 +01:00
Herbert 95684a64a5 s/order/model 2019-11-21 13:51:17 +01:00
Herbert 835e5ce56a use (! ... codestyle 2019-11-21 13:48:34 +01:00
Herbert 12dd5a4909 adjusted OrderRepository incrementId and added tiny unit test 2019-11-21 13:42:32 +01:00
Herbert c54d803bbf introduce 'checkout.order.orderitem.save.[before/after]' events 2019-11-18 16:11:15 +01:00
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
Jitendra Singh a9ce5bea76
Merge pull request #1726 from prashant-webkul/bugs_patch_1
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:42:55 +05:30
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
jitendra 62533d9df8 postcode column changed to varchar from int 2019-10-24 17:38:08 +05:30
jitendra 8671abfcd3 Issue #1489 fixed 2019-10-23 17:52:01 +05:30
jitendra e5d606c33e Issue #1489 fixed 2019-10-23 13:38:29 +05:30
jitendra be83a12752 Issue #1680 fixed 2019-10-23 10:49:44 +05:30
jitendra 22fe76c83c Issue #1680 fixed 2019-10-22 18:57:06 +05:30
jitendra 94d7289927 Issue #1631 fixed 2019-10-15 18:59:54 +05:30
jitendra eaff6836fc Issue #1489 fixed 2019-10-15 12:35:58 +05:30
jitendra 6d4a857c7a Issue #1618 fixed 2019-10-14 15:56:35 +05:30
jitendra 95d427d42c Issue #1623 fixed 2019-10-14 14:45:09 +05:30
jitendra 373d313e84 Issue #1607 2019-10-11 13:50:15 +05:30
jitendra 381fa408ee Issue #1550 fixed 2019-10-11 13:02:34 +05:30
jitendra 310f426272 Issue #1582 fixed 2019-10-11 11:00:16 +05:30
jitendra 79a80e666f Issue #1583 fixed 2019-10-11 10:32:40 +05:30
jitendra b707a855fc Updated refund for new product types 2019-10-10 12:33:05 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla 6125252fda Change Invoice to Order in Invoice Order configuration 2019-09-24 17:20:26 +05:30
jitendra 59fcee0e15 Order status issue fixed 2019-09-23 17:35:00 +05:30
jitendra 1fc043b5b7 Refuned total issue fixed 2019-09-23 16:49:34 +05:30
jitendra 80cdd1826b Refund grantotal issue fixed with different currency 2019-09-23 11:48:25 +05:30
jitendra ca23da77a9 Issue #1489 fixed 2019-09-20 18:49:59 +05:30
jitendra e5d7124a0c Fixed undefined variable exception in RefundRepository.php 2019-09-19 19:23:21 +05:30
jitendra b0e9328090 Issue #1492 fixed 2019-09-19 18:57:58 +05:30
jitendra 600a4a9be0 Fixed Issue #1490 2019-09-19 17:24:56 +05:30
Jitendra Singh 4c55c7c498
Merge pull request #1487 from jitendra-webkul/refund
Issue #1486 fixed
2019-09-19 15:26:57 +05:30
jitendra 9db41abe13 Issue #1486 fixed 2019-09-19 15:26:07 +05:30
Jitendra Singh e87968da70
Merge pull request #1485 from jitendra-webkul/refund
Refund issues fixed
2019-09-19 13:53:06 +05:30
jitendra ccd86eee76 Refund issues fixed 2019-09-19 13:52:33 +05:30
Jitendra Singh 7619ede6a2
Merge pull request #1476 from jitendra-webkul/refund
Refund system completed
2019-09-18 18:59:48 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
rahul shukla b3651a135a Issue #1461 2019-09-17 12:36:36 +05:30
Jitendra Singh ac48a20822
Merge pull request #1343 from lemmeV/master
added configurable order numbers
2019-09-11 15:51:30 +05:30
jitendra 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
rahul shukla 8d578c3720 wrong grand total in invoice 2019-09-09 15:33:05 +05:30
rahul shukla 98df7f25f7 Issue #1256 2019-09-09 12:57:28 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
jitendra 40b7126d1b Configurable qty issue fixed 2019-09-05 18:01:06 +05:30
jitendra 3c5a2792e3 Removed configurable checks and deleted unwanted files 2019-09-04 16:23:05 +05:30
jitendra eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
Lemme Velleõu ed81e13d97 fixed suffix select 2019-08-23 10:10:40 +03:00
Lemme Velleõu 97817c3e5d added defaults to order number config 2019-08-23 09:34:12 +03:00
Lemme Velleõu 4f8f470095 added configurable order numbers 2019-08-22 18:24:30 +03:00
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
jitendra f529a128cd Removed unnecessary code from sevice providers 2019-07-01 20:03:16 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +05:30
jitendra 3ef416b22e Added downloadable order item info 2019-06-29 17:51:49 +05:30
jitendra ad6e422fdb Added downloadable and virtual products 2019-06-29 15:23:34 +05:30
jitendra 55b71e1e66 updated 2019-06-28 19:48:52 +05:30
jitendra edec481f26 Sales discount calculation implemented 2019-05-23 17:00:11 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
rahul shukla ee189baf7a merge with master 2019-04-05 16:55:09 +05:30
rahul shukla fdb6284856 issue #760 wishlist 2019-04-05 16:54:09 +05:30
Jitendra Singh 89613136ff
Merge pull request #795 from imanghafoori1/flatten_code
flatten code
2019-04-05 11:10:49 +05:30
imanghafoori ca93e36826 flatten code 2019-04-04 23:53:59 +04:30
imanghafoori 07806c44fc flatten code 2019-04-04 23:51:33 +04:30
Jitendra Singh d18b862f85
Merge pull request #796 from imanghafoori1/fix_docblocks
fix docblocks
2019-04-04 12:07:55 +05:30
imanghafoori 56933912eb fix docblocks 2019-04-03 18:13:59 +03:30
imanghafoori 2daf56c4fd refactor using ::class 2019-04-03 17:24:45 +03:30
rahul shukla 12a8a91476 issue #727 2019-03-29 10:24:22 +05:30
jitendra 7cf585c8da Fixed issue #390 2019-01-25 19:44:07 +05:30
jitendra 70a24a64b9 Inventory issue fix 2019-01-18 17:23:36 +05:30
jitendra b418b27de3 Issue #389 fixed 2019-01-18 16:49:03 +05:30
jitendra fbbf1fe99f Issues fixed 2019-01-18 16:40:40 +05:30
jitendra c596ee8abe Extra new line removed from order repository 2019-01-18 10:48:25 +05:30
jitendra 4488002522 Updated event code for order action 2019-01-17 17:29:07 +05:30
jitendra d19d57997e Added Order Cancel Event 2019-01-17 17:17:53 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
jitendra 9c1612d0ab Assets compiled for production 2019-01-11 15:31:10 +05:30
jitendra f1371fd6a0 Product inventory management updated 2019-01-11 14:51:20 +05:30
jitendra ab07518779 Order collect total function issue fixed 2019-01-09 13:27:43 +05:30
jitendra 25e5191581 Order collect total function issue fixed 2019-01-09 13:24:59 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
jitendra 2e668c7020 Inventory source selection feature added during shipment creation 2018-12-26 15:30:23 +05:30
jitendra e29c5f39f0 Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165 2018-12-06 17:29:26 +05:30
jitendra db51f0df0e Invoice status issue fixed 2018-11-28 12:44:04 +05:30
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
jitendra f0ef4f910a Paypal Integration added 2018-11-16 15:41:08 +05:30
jitendra c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
jitendra b182325772 Customer address form issues fixed, invoice print feature addred 2018-11-01 19:18:59 +05:30
jitendra 27b1f1fad9 Issues fixed 2018-10-26 19:13:01 +05:30
jitendra 69ea3a1830 Product grid inventory update implemented after order created 2018-10-26 11:28:24 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
jitendra 13ae5d58c0 Dashboard completed 2018-10-23 17:15:44 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
rahul shukla ec03cbd63e conflict resolve 2018-10-15 16:16:50 +05:30
rahul shukla f1a0a2bcda order 2018-10-15 16:15:29 +05:30
jitendra 7f1675e37c Order cancel implemented 2018-10-15 16:09:09 +05:30
rahul shukla 8717edf059 customer pannel 2018-10-15 13:52:27 +05:30
jitendra d00bb078a1 Shipment and invoice creation completed 2018-10-09 17:32:22 +05:30
jitendra f87a47d798 Order creation completed 2018-10-05 17:29:43 +05:30
jitendra a9106e0486 Order create 2018-10-05 11:48:58 +05:30
jitendra c235c22e79 Order creation 2018-10-04 12:12:06 +05:30
jitendra 0bb851d518 Sale package schema added and renamed package cart to checkout 2018-09-28 18:24:26 +05:30
jitendra 9e57c5117b Cart page issues fixedx 2018-09-27 15:31:25 +05:30