Jitendra Singh
|
0f42e8ff8f
|
Resolved conflicts
|
2020-02-27 12:07:20 +05:30 |
rahul shukla
|
e37b4fed14
|
locale messgaes improvement
|
2020-02-26 16:34:41 +05:30 |
|
Jitendra Singh
|
91064cd0bc
|
Quantity availability check implemented for default booking
|
2020-02-26 13:11:24 +05:30 |
|
Jitendra Singh
|
d5b54b393b
|
Event booking type add cart updated
|
2020-02-25 16:42:32 +05:30 |
|
Jitendra Singh
|
7d2ff93f43
|
Resolve conflicts
|
2020-02-25 11:44:34 +05:30 |
|
Jitendra Singh
|
9eb7113aa4
|
Fixed else if indentation in javascript
|
2020-02-24 18:53:34 +05:30 |
|
Jitendra Singh
|
195eb82802
|
Replace else if with elseif
|
2020-02-24 17:49:12 +05:30 |
Jitendra Singh
|
c52e19d53d
|
Merge pull request #2546 from rahulshukla-webkul/development
Development
|
2020-02-24 13:47:58 +05:30 |
|
rahul shukla
|
8fa7bc8c10
|
Issue #2451 fixed
|
2020-02-24 13:45:11 +05:30 |
|
Jitendra Singh
|
e552183e9a
|
Merge pull request #2523 from ghermans/dutch
#2512 - Dutch translations and removing static text
|
2020-02-24 13:34:27 +05:30 |
Glenn Hermans
|
6f6f1c66a5
|
translations
|
2020-02-21 17:09:26 +01:00 |
|
Jitendra Singh
|
5c696f8d00
|
Resolved conflicts
|
2020-02-21 19:36:17 +05:30 |
|
Glenn Hermans
|
0f233f08fe
|
Updating translations
|
2020-02-21 12:36:26 +01:00 |
|
rahul shukla
|
253ac52cc1
|
post code in shipping address
|
2020-02-21 16:56:57 +05:30 |
|
Glenn Hermans
|
fc84c4a047
|
#2512 - Added more shop translations
|
2020-02-21 11:23:46 +01:00 |
|
Jitendra Singh
|
24e69e2cd9
|
Merge pull request #2247 from Haendlerbund/fix-tax-handling
Fix tax handling
|
2020-02-21 15:20:35 +05:30 |
|
rahul shukla
|
a4b3316b29
|
Issue #2533 fixed and change log updated
|
2020-02-21 14:41:42 +05:30 |
|
ghermans
|
d4ce50da9f
|
#2512 more translations
|
2020-02-21 09:44:12 +01:00 |
|
ghermans
|
283c6e437c
|
#2512 starting to translate the shop files
|
2020-02-21 09:30:04 +01:00 |
Annika Wolff
|
d50510a626
|
resolve merge issue, add type hints in Cart helper function
|
2020-02-21 08:36:52 +01:00 |
Annika Wolff
|
154a933dc6
|
Merge branch 'master' into fix-tax-handling
|
2020-02-20 17:19:28 +01:00 |
|
rahul shukla
|
66ba69586d
|
filter issue in category
|
2020-02-20 16:31:46 +05:30 |
|
rahul shukla
|
6714b1d7c8
|
Issue #2468
|
2020-02-20 13:13:02 +05:30 |
|
Jitendra Singh
|
5f6e3be796
|
Improved shop package code style
|
2020-02-20 12:35:51 +05:30 |
|
rahul shukla
|
38f1251568
|
Issue #2468
|
2020-02-20 12:30:00 +05:30 |
prateek srivastava
|
e1cdff607b
|
Merge branch 'master' of https://github.com/bagisto/bagisto
|
2020-02-19 16:26:06 +05:30 |
|
prateek srivastava
|
36f795f09a
|
assets for production
|
2020-02-19 16:25:40 +05:30 |
|
rahul shukla
|
86e31346d0
|
remove console
|
2020-02-19 16:17:31 +05:30 |
|
rahul shukla
|
d62b61b19c
|
Issue #2463
|
2020-02-19 16:12:54 +05:30 |
|
prateek srivastava
|
6052b6355d
|
Merge branch 'master' of https://github.com/bagisto/bagisto
|
2020-02-19 15:42:35 +05:30 |
|
prateek srivastava
|
74251ef2d2
|
issue 2470 fixed
|
2020-02-19 15:42:00 +05:30 |
|
rahul shukla
|
33f882209a
|
code improvement
|
2020-02-19 15:32:52 +05:30 |
|
rahul shukla
|
b6cdcad01d
|
change depandeciy of slider component, hide attribute with option
|
2020-02-19 15:03:57 +05:30 |
|
Jitendra Singh
|
4801c2f371
|
Merge pull request #2497 from SteffenMahler/patch-1
Update CartController.php
|
2020-02-18 18:49:54 +05:30 |
SteffenMahler
|
b58ba0955e
|
Update CartController.php
It would be very useful to have an event dispatched, if the "Buy Now" button of a product was clicked.
|
2020-02-18 14:08:02 +01:00 |
|
rahul shukla
|
bd82e011c0
|
Issue #2490
|
2020-02-18 18:34:32 +05:30 |
|
rahul shukla
|
8d2662b996
|
Issue #2467
|
2020-02-17 19:36:31 +05:30 |
|
rahul shukla
|
9d80f73319
|
Issue #2449
|
2020-02-13 14:41:40 +05:30 |
|
Jitendra Singh
|
2fce1383ce
|
Merge pull request #2413 from vivek-webkul/patch-28
[Fixed: Issue #2410 has been resolved.]
|
2020-02-11 11:09:58 +05:30 |
Vivek Sharma
|
ffea130723
|
[Fixed: Issue #2410 has been resolved.]
|
2020-02-10 13:28:22 +05:30 |
shubhammehrotra.symfony@webkul.com
|
6f37c37dd1
|
resolved conflicts
|
2020-02-10 12:25:22 +05:30 |
Steffen Mahler
|
59f1956a21
|
merge bagisto/master into fix-tax-handling
|
2020-02-08 20:48:27 +01:00 |
|
shubhammehrotra.symfony@webkul.com
|
8fc51a7be4
|
rtl updates
|
2020-02-08 19:00:58 +05:30 |
|
Vivek Sharma
|
d2a2b2a8c6
|
[Fixed: issue #2384 has been resolved.]
|
2020-02-08 12:59:08 +05:30 |
|
Jitendra Singh
|
3c11496274
|
Merge pull request #2351 from aayush-webkul/master
Added old() function in Admin and Shop package
|
2020-02-07 15:53:24 +05:30 |
|
Steffen Mahler
|
b94fc9fc8c
|
merge master and resolve conflicts
|
2020-02-07 10:44:04 +01:00 |
|
Jitendra Singh
|
88cce4b262
|
Merge pull request #2368 from jitendra-webkul/1.0
Issue #2360 fixed
|
2020-02-07 14:00:05 +05:30 |
|
Jitendra Singh
|
32180aee33
|
Issue #2360 fixed
|
2020-02-07 13:59:14 +05:30 |
Aayush Bhatt
|
7fc6fd7d3d
|
old() function implimented in admin and shop package
|
2020-02-06 22:04:33 +05:30 |
|
Aayush Bhatt
|
3b74ee4129
|
Merge https://github.com/bagisto/bagisto
|
2020-02-06 20:22:38 +05:30 |
|
Aayush Bhatt
|
d9f2f1ab3d
|
Duplicate old() functioon fixed and working in admin panel
|
2020-02-06 20:07:26 +05:30 |
|
Jitendra Singh
|
4568703be2
|
Merge pull request #2347 from jitendra-webkul/1.0
Issue #2335 fixed
|
2020-02-06 19:22:18 +05:30 |
|
Jitendra Singh
|
be79142a7b
|
Issue #2335 fixed
|
2020-02-06 19:21:24 +05:30 |
|
Jitendra Singh
|
322468e200
|
Merge pull request #2333 from jitendra-webkul/1.0
Issue #2142 fixed
|
2020-02-06 17:19:45 +05:30 |
|
Jitendra Singh
|
4f71d4727b
|
Issue #2142 fixed
|
2020-02-06 17:18:51 +05:30 |
|
Jitendra Singh
|
51dc65c9a7
|
Merge pull request #2315 from vivek-webkul/patch-13
[Fixed: issue #2313 resolved.]
|
2020-02-06 15:21:05 +05:30 |
|
rahul shukla
|
cd739789f0
|
Issue #2317
|
2020-02-06 13:46:02 +05:30 |
|
Vivek Sharma
|
bc28c8c4fe
|
[Fixed: issue #2313 resolved.]
|
2020-02-06 12:37:50 +05:30 |
|
rahul shukla
|
570ce2610d
|
Change validation way in vat_id
|
2020-02-06 12:08:27 +05:30 |
|
Steffen Mahler
|
ae467fc182
|
merge master, refactoring tests
|
2020-02-04 18:13:09 +01:00 |
|
Annika Wolff
|
53c5d107a6
|
Merge branch 'master' into small-bugfix-and-tiny-refactoring
|
2020-02-04 14:08:46 +01:00 |
|
Steffen Mahler
|
7c661efd88
|
add unit tests, refactoring
|
2020-02-04 11:18:40 +01:00 |
|
Steffen Mahler
|
cb5e3a47f6
|
fix tax handling, add functional cest for cart
|
2020-02-04 08:50:37 +01:00 |
|
Jitendra Singh
|
453908a768
|
Merge pull request #2214 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
add ability to provide company_name in address during checkout
|
2020-02-04 11:40:39 +05:30 |
|
rahul shukla
|
7ea4c4219c
|
Issue #2227
|
2020-02-03 18:57:50 +05:30 |
|
rahul shukla
|
9a9400fe23
|
Issue #2219
|
2020-02-03 17:01:23 +05:30 |
|
Steffen Mahler
|
8abce3302a
|
tax helper introduced, views changed to display multiple tax rates
|
2020-01-31 16:08:01 +01:00 |
|
Annika Wolff
|
e7c29f40e2
|
Merge branch 'master' into small-bugfix-and-tiny-refactoring
|
2020-01-31 09:41:58 +01:00 |
Herbert Maschke
|
76b58e9bd8
|
some first_name and last_name input fields
|
2020-01-31 05:59:12 +01:00 |
|
Herbert Maschke
|
6be3d086f8
|
add ability to provide company_name in address during checkout (optional)
|
2020-01-30 20:56:01 +01:00 |
|
Steffen Mahler
|
d3e00d4543
|
add functional test for cart, fix tests with usage of
|
2020-01-28 16:28:29 +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 |
|
rahul shukla
|
434b681962
|
Issue #2186
|
2020-01-28 19:09:15 +05:30 |
|
Jitendra Singh
|
4b376b5ed7
|
Merge pull request #2027 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
Introduce optional company name and sales tax id columns to customer addresses
|
2020-01-28 17:00:36 +05:30 |
|
Jitendra Singh
|
7293716b1b
|
Merge pull request #2170 from rahulshukla-webkul/development
Issue #742 and #2165
|
2020-01-28 15:02:47 +05:30 |
|
rahul shukla
|
3144720c48
|
Issue #742 and #2165
|
2020-01-28 14:56:05 +05:30 |
Florian Bosdorff
|
5188b1b7f9
|
Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-28 08:15:11 +01:00 |
Florian Bosdorff
|
d125f9eba0
|
add reporting for try-catch-sections
|
2020-01-27 17:06:03 +01:00 |
|
Steffen Mahler
|
223c96b205
|
.
|
2020-01-27 13:06:31 +01:00 |
|
Jitendra Singh
|
b8115c808e
|
Merge pull request #2144 from Haendlerbund/trigger-db-prefixes
fix trigger according to optional db-prefix
|
2020-01-27 17:21:26 +05:30 |
|
Jitendra Singh
|
0b3a7a6c6a
|
Merge pull request #2157 from jitendra-webkul/1.0
Removed commented code
|
2020-01-27 16:52:08 +05:30 |
|
Jitendra Singh
|
8176317a59
|
Removed commented code
|
2020-01-27 16:46:58 +05:30 |
|
Jitendra Singh
|
3e2e6f2c75
|
Merge pull request #2156 from jitendra-webkul/1.0
Issue #2087 fixed
|
2020-01-27 16:42:01 +05:30 |
|
Jitendra Singh
|
25d94ea944
|
Issue #2087 fixed
|
2020-01-27 16:41:25 +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
|
4fd6599bda
|
Issue #2147
|
2020-01-27 13:24:22 +05:30 |
|
Florian Bosdorff
|
d2a8911aaa
|
fix trigger according to optional db-prefix
|
2020-01-26 21:10:57 +01:00 |
|
Herbert Maschke
|
e948b30e35
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-24 15:13:16 +01:00 |
|
rahul shukla
|
d0dfa3fe9e
|
Issue #2132
|
2020-01-24 14:39:11 +05:30 |
|
Steffen Mahler
|
a5c49e4b76
|
button 'update cart' will only be shown if corresponding products are in cart
|
2020-01-24 07:15:49 +01:00 |
|
Herbert Maschke
|
5ebb67dd81
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-23 14:18:17 +01:00 |
|
rahul shukla
|
2c0b7e4e54
|
try and catch in password section and wishlist add remove
|
2020-01-23 15:32:06 +05:30 |
|
Jitendra Singh
|
956259cc32
|
Merge pull request #2123 from rahulshukla-webkul/development
Issue #2087
|
2020-01-23 11:51:19 +05:30 |
|
Jitendra Singh
|
da4980bfbe
|
Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration
Issue 1183/guest checkout configuration
|
2020-01-23 11:51:08 +05:30 |
|
rahul shukla
|
2d8f5f412e
|
Issue #2087
|
2020-01-23 10:42:09 +05:30 |
|
Herbert Maschke
|
4629a3bb0f
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-22 14:59:18 +01:00 |
|
rahul shukla
|
0337959327
|
merge conflicts
|
2020-01-22 18:50:01 +05:30 |
|
rahul shukla
|
01f0fc9a57
|
2089 and updated codeception dependencies
|
2020-01-22 18:44:53 +05:30 |
|
Florian Bosdorff
|
61d9b59e5f
|
Merge master into issue-1183/guest-checkout-configuration
|
2020-01-22 08:10:45 +01:00 |
rahulshukla-webkul
|
8bd9f0bc9d
|
Revert "Resolve #1183 guest checkout configuration"
|
2020-01-22 11:58:56 +05:30 |
|
Jitendra Singh
|
3aec5047f6
|
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
Resolve #1183 guest checkout configuration
|
2020-01-22 11:32:45 +05:30 |
|
Herbert Maschke
|
8d1d03d25b
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-21 13:44:09 +01:00 |
|
Jitendra Singh
|
92636543cd
|
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
|
2020-01-21 16:34:38 +05:30 |
|
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
|
82dbdee0b8
|
helper functions updated
|
2020-01-21 15:23:04 +05:30 |
|
rahul shukla
|
debf060b03
|
helper function updated
|
2020-01-21 15:13:01 +05:30 |
|
rahul shukla
|
e3db0b164c
|
conflict resolve
|
2020-01-21 13:24:19 +05:30 |
|
Jitendra Singh
|
176feecb55
|
Resolved conflicts
|
2020-01-20 19:59:04 +05:30 |
|
Jitendra Singh
|
b18f2292c4
|
Issue #2071 fixed
|
2020-01-20 19:57:10 +05:30 |
|
Jitendra Singh
|
dfa4272cf2
|
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots
Set correct category url_path in multiple root categories environment
|
2020-01-20 13:27:04 +05:30 |
|
Annika Wolff
|
132dd6c0f0
|
introduce guest checkout configuration
|
2020-01-17 14:42:47 +01:00 |
|
Herbert Maschke
|
7c9908401f
|
improve the way server side validation errors are being displayed
|
2020-01-17 12:54:02 +01:00 |
|
Jitendra Singh
|
880868738a
|
Merge pull request #2067 from jitendra-webkul/1.0
Issue #2058 fixed
|
2020-01-17 12:06:06 +05:30 |
|
Jitendra Singh
|
7d7e86e85c
|
Issue #2058 fixed
|
2020-01-17 12:05:28 +05:30 |
|
Annika Wolff
|
976d19cd74
|
Merge Bagisto master into Haendlerbund/Bagisto master (#14)
* added bagisto:install command
* updates for uploading attachments
* Issue #1808
* Issue #1779 fixed
* Issue #2045
* Issue #1971
* Issue #1779 fixed
* fire event on creating/updating slider
* Issue #1863 fixed
* Issue #1863 fixed
* Removed ')' in page edit blade
* Issue #2054 fixed
* Issue #2054 fixed
* Added mail from name field in .env.example file, Issue #2051
Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
|
2020-01-16 13:54:18 +01:00 |
|
Herbert Maschke
|
e0c2814f2e
|
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
|
2020-01-15 15:29:55 +01:00 |
|
Jitendra Singh
|
ab8001d20c
|
Merge pull request #2062 from jitendra-webkul/1.0
Issue #2054 fixed
|
2020-01-15 19:08:54 +05:30 |
|
Jitendra Singh
|
130ed41044
|
Issue #2054 fixed
|
2020-01-15 19:07:12 +05:30 |
|
Jitendra Singh
|
d80a3c7a5f
|
Merge pull request #2059 from jitendra-webkul/1.0
Removed ')' in page edit blade
|
2020-01-15 18:42:24 +05:30 |
|
Jitendra Singh
|
b552aba450
|
Removed ')' in page edit blade
|
2020-01-15 18:40:57 +05:30 |
|
Annika Wolff
|
91d6586ad8
|
resolve exception, rename function haveDownloadableItems
|
2020-01-15 11:53:48 +01:00 |
|
Annika Wolff
|
a75f3dab51
|
resolve conflicts
|
2020-01-15 11:37:38 +01:00 |
David Große
|
e0b0740a83
|
typo: s/formi/form
|
2020-01-14 13:07:49 +01:00 |
|
Jitendra Singh
|
3901c1ad2e
|
Merge pull request #2048 from rahulshukla-webkul/development
Issue #2045
|
2020-01-14 15:27:47 +05:30 |
|
rahul shukla
|
9c7770b29e
|
Issue #2045
|
2020-01-14 15:25:04 +05:30 |
|
David Große
|
72c3e289c7
|
remove the splitting into first_name and last_name again - it can be desastrous to drop a column in a productive environment
|
2020-01-14 10:25:26 +01:00 |
|
Jitendra Singh
|
0e2b8163e6
|
Merge pull request #2047 from jitendra-webkul/1.0
Issue #1779 fixed
|
2020-01-14 13:24:26 +05:30 |
|
Jitendra Singh
|
05a619d39b
|
Issue #1779 fixed
|
2020-01-14 13:23:49 +05:30 |
|
David Große
|
7eee7e3134
|
split the 'name' column in the customer addresses into 'first_name' and 'last_name' - it is more common to save the data in this structure
|
2020-01-13 11:20:04 +01:00 |
|
Jitendra Singh
|
a42724d5f3
|
Merge pull request #2038 from jitendra-webkul/1.0
Issue #1795 fixed
|
2020-01-13 13:18:25 +05:30 |
|
Jitendra Singh
|
3368eb5ba5
|
Issue #1795 fixed
|
2020-01-13 13:17:27 +05:30 |
|
Jitendra Singh
|
1e18cebb00
|
Merge pull request #2037 from jitendra-webkul/1.0
Issue #1764 fixed
|
2020-01-13 12:45:25 +05:30 |
|
Jitendra Singh
|
cf36d252a0
|
Issue #1764 fixed
|
2020-01-13 12:44:36 +05:30 |
|
Jitendra Singh
|
9380a37479
|
Merge pull request #2036 from jitendra-webkul/1.0
Issue #1786 fixed
|
2020-01-13 12:38:30 +05:30 |
|
Jitendra Singh
|
27e728d54e
|
Issue #1786 fixed
|
2020-01-13 12:37:41 +05:30 |
|
David Große
|
24f6fb2290
|
display server side errors
|
2020-01-10 14:20:47 +01:00 |
|
David Große
|
109b503609
|
display vat_id and company_name in edit.blade.php
|
2020-01-10 14:16:34 +01:00 |
|
David Große
|
7429d32072
|
introduce VatValidator.php
|
2020-01-10 14:07:58 +01:00 |
|
David Große
|
98632b0de8
|
remove required html classes
|
2020-01-10 13:24:33 +01:00 |
|
David Große
|
3af9a825c9
|
add optional vat_id to customer addresses
|
2020-01-10 11:59:53 +01:00 |
|
Jitendra Singh
|
9d1887a9a1
|
Merge pull request #2026 from jitendra-webkul/1.0
Issue #1804 fixed
|
2020-01-10 16:28:27 +05:30 |
|
Jitendra Singh
|
a7d02d552f
|
Issue #1804 fixed
|
2020-01-10 16:27:35 +05:30 |
|
Jitendra Singh
|
30cb75c307
|
Merge pull request #2024 from jitendra-webkul/1.0
Issue #1821 fixed
|
2020-01-10 15:48:53 +05:30 |
|
Jitendra Singh
|
b336a998d3
|
Issue #1821 fixed
|
2020-01-10 15:47:55 +05:30 |
|
David Große
|
3ca5c99f27
|
introduce company_name column to customer_addresses
|
2020-01-10 11:05:09 +01:00 |
|
Jitendra Singh
|
9fbe756075
|
Fixed review controller compact undefined variable issue
|
2020-01-10 15:14:29 +05:30 |
|
Jitendra Singh
|
01833962a9
|
Merge pull request #2023 from jitendra-webkul/1.0
Issue #1842 fixed
|
2020-01-10 14:05:25 +05:30 |
|
Jitendra Singh
|
8db495446a
|
Issue #1842 fixed
|
2020-01-10 14:00:11 +05:30 |
|
Jitendra Singh
|
a8d8580f89
|
Merge pull request #2022 from jitendra-webkul/1.0
Issue #1845 fixed
|
2020-01-10 13:54:04 +05:30 |