Devansh
|
8f33e82b22
|
Merged Changes From Master Removed My Created Method And Added Method Which Came From Master
|
2020-08-06 16:34:11 +05:30 |
|
Devansh
|
ad37f852b9
|
Merge branch 'invoice_mail_issue' of https://github.com/devansh-webkul/bagisto into invoice_mail_issue
|
2020-08-06 16:32:28 +05:30 |
|
Devansh
|
c6646677f2
|
Customer Locale Added For All Mail
|
2020-08-06 16:31:05 +05:30 |
Devansh
|
eaa5abc2dd
|
Merge branch 'master' into invoice_mail_issue
|
2020-08-06 12:58:07 +05:30 |
|
Devansh
|
262d72f4b6
|
Issue Fixed
|
2020-08-04 18:30:37 +05:30 |
Glenn Hermans
|
3863ae7b72
|
fixed requested changes
|
2020-07-29 14:02:06 +02:00 |
|
Glenn Hermans
|
701d94e62e
|
ready for testing
|
2020-07-28 16:48:27 +02:00 |
Herbert Maschke
|
ef99a1e981
|
properly pass the data array into the 'checkout.order.safe.before' event
|
2020-07-06 14:46:19 +02:00 |
Florian Bosdorff
|
b3bdcc473e
|
change naming of order increment generator
|
2020-06-30 15:11:35 +02:00 |
|
Florian Bosdorff
|
e480c6cda4
|
Merge branch 'bagisto/master' into customizeable-order-number-generators
|
2020-06-30 10:46:53 +02:00 |
|
Florian Bosdorff
|
98111f686c
|
add ability to customize order incrment number generator
|
2020-06-30 09:46:48 +02:00 |
Jitendra Singh
|
549c0e38d3
|
Merge pull request #3353 from Haendlerbund/expose-downloadable-links
feature: expose downloadable links
|
2020-06-25 12:25:20 +05:30 |
|
Herbert Maschke
|
f30da1f3a4
|
expose downloadable links in API Resource\Sales\Order.php and src\Models\OrderItem.php
|
2020-06-24 20:53:01 +02:00 |
Annika Wolff
|
b61f57a698
|
add additional field
|
2020-06-18 10:10:16 +02:00 |
|
Annika Wolff
|
1c1d99b6af
|
autoformat
|
2020-06-11 10:56:08 +02:00 |
|
Annika Wolff
|
a196b7ac02
|
extend order item and cart item factories
|
2020-06-11 10:51:40 +02:00 |
Pranshu Tomar
|
020df01980
|
Issue #3054 fixed
|
2020-05-13 16:53:25 +05:30 |
|
Jitendra Singh
|
45e61682cd
|
Merge pull request #3013 from jitendra-webkul/1.0
Order comment feature added
|
2020-05-06 22:52:09 +05:30 |
|
Pranshu Tomar
|
2a9c3de89a
|
Order comment feature added
|
2020-05-06 22:48:48 +05:30 |
|
Jitendra Singh
|
7629d85d16
|
Merge pull request #2910 from Haendlerbund/unified-addresses
Unified addresses (#2902)
|
2020-04-22 17:05:57 +05:30 |
|
Annika Wolff
|
be435208df
|
add option to OrderItemFactory to use existing product
|
2020-04-21 10:52:48 +02:00 |
|
Florian Bosdorff
|
754c52e556
|
rename address types
|
2020-04-20 08:22:31 +02:00 |
|
Florian Bosdorff
|
910f76952f
|
fix address-constrains; fix address global scopes
|
2020-04-17 15:54:02 +02:00 |
|
Florian Bosdorff
|
01d4cb026f
|
fix address_type at many places; add tests for address relations
|
2020-04-17 11:09:59 +02:00 |
|
Florian Bosdorff
|
5a9dfd8561
|
add unified address-table and handling for models
|
2020-04-16 21:13:19 +02:00 |
Jitendra Singh
|
deda73af48
|
Issue #2594 fixed
|
2020-03-19 17:07:46 +05:30 |
|
Herbert Maschke
|
c76c7a1d88
|
introduce cart belongsTo Relation in Order Model
|
2020-03-19 08:17:29 +01:00 |
rahul shukla
|
7174ccbfd0
|
Issue #2549
|
2020-03-18 18:48:02 +05:30 |
|
Herbert Maschke
|
7a3a1726bc
|
Merge branch 'bagisto/master' into order-workflow-improvements
|
2020-03-06 15:50:26 +01:00 |
|
Jitendra Singh
|
9846fb9408
|
Merge pull request #2623 from jitendra-webkul/booking-product
Booking product added and improved code style and code comments
|
2020-03-06 17:51:25 +05:30 |
|
Annika Wolff
|
f4f5d2ea71
|
make invoice factory php7.3 compatible
|
2020-03-06 12:52:35 +01:00 |
|
Herbert Maschke
|
19ebc48fbc
|
further refactoring of Cart Component
|
2020-03-05 15:52:20 +01:00 |
|
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 |