ottopodo
9229e36175
Italian Translations
2020-05-11 19:19:28 +02:00
Florian Bosdorff
48e0026ec2
fix typo
2020-05-09 12:29:34 +02:00
Florian Bosdorff
85ef3fe69b
remove unused exception handler; make exception handler extendable
2020-05-09 12:21:54 +02:00
Vivek
433a2b68df
[Updated: Address's contract, model and proxy classes.]
2020-05-08 12:18:43 +05:30
Jitendra Singh
7f3e564c14
Merge pull request #2966 from Haendlerbund/add_tests_for_cart_rules
...
Add tests for cart rules
2020-05-01 18:11:03 +05:30
Jitendra Singh
7639dfbf51
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-rule-grid
...
introduce channel and customer group filter for cart rule grid
2020-05-01 18:09:48 +05:30
Steffen Mahler
95f190375e
set price faker in Laravel5Helper to 2 decimals, fix rounding in CartTaxesCest too
2020-05-01 11:18:56 +02:00
SteffenMahler
ede46da84b
Merge branch 'master' into add_tests_for_cart_rules
2020-04-29 10:31:06 +02:00
Herbert Maschke
3154d27f52
introduce channel and customer group filter for cart rule grid
2020-04-29 09:19:47 +02:00
Steffen Mahler
d973ec94c0
add CartRuleCest
2020-04-28 18:15:40 +02:00
Jitendra Singh
22b4079fdb
Merge pull request #2952 from jitendra-webkul/1.0
...
Auto exchange rate feature added
2020-04-27 20:08:26 +05:30
Pranshu Tomar
b3b20a904c
Auto exchange rate feature added
2020-04-27 19:57:13 +05:30
Jitendra Singh
8d82b19d83
Merge pull request #2777 from gfd6th/master
...
Add Cacheable Trait to Repository
2020-04-27 11:34:57 +05:30
Jitendra Singh
9b58604c23
Merge pull request #2928 from jitendra-webkul/1.0
...
Moved commands to packages
2020-04-23 18:25:53 +05:30
Pranshu Tomar
8030b097e7
Moved command to packages
2020-04-23 13:46:47 +05:30
Jitendra Singh
7629d85d16
Merge pull request #2910 from Haendlerbund/unified-addresses
...
Unified addresses (#2902 )
2020-04-22 17:05:57 +05:30
Jitendra Singh
7f7a3a9678
Merge pull request #2904 from Haendlerbund/introduce-channel-and-channel-inventory-factory
...
introduce 2 new factories for channel and channel inventory source
2020-04-21 16:30:09 +05:30
Florian Bosdorff
4e96ce5b59
fix typo in address migration
2020-04-20 09:37:39 +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
Annika Wolff
3729b9daaf
introduce channel and channel inventory source factories
2020-04-16 14:05:42 +02:00
rahulshukla-home
b65601ecd0
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-04-13 23:04:02 +05:30
rahulshukla-home
b88e239ad2
Issue #2543 fixed
2020-04-13 23:03:45 +05:30
Jitendra Singh
9508c3d05c
Merge branch 'master' into webinstall
2020-04-11 18:53:30 +05:30
Jitendra Singh
9752f634e7
Merge pull request #2787 from Haendlerbund/add-option-for-set-current-channel
...
add option to set current channel
2020-04-10 11:45:04 +05:30
hexu
81c6a1b538
Merge pull request #3 from bagisto/master
...
update
2020-04-08 20:43:49 +08:00
Herbert Maschke
df6dc49313
Merge branch 'bagisto/master' into improve-have-product-faker
2020-04-04 11:14:29 +02:00
rahulshukla-home
961850b2e9
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-04-03 13:31:32 +05:30
rahulshukla-home
07f351322d
revert back changes in format price
2020-04-03 13:31:09 +05:30
Herbert Maschke
2bf180e24f
generate product as "buyable as guest" by default
2020-03-31 15:10:18 +02:00
Herbert Maschke
5219b03265
4,1,1000
2020-03-31 15:01:42 +02:00
Herbert Maschke
e83917a2e6
attempt to fake 4 instead of 2 decimals in price
2020-03-31 14:50:54 +02:00
Herbert Maschke
5e89baf4e9
improve randomFloat faker values
2020-03-31 14:46:08 +02:00
Herbert Maschke
3048ae4a7b
restore createInventory, its necessary...
2020-03-31 14:40:40 +02:00
Herbert Maschke
0f5913fbba
various code style improvements
2020-03-31 14:35:01 +02:00
Herbert Maschke
f7a69d4a30
optimize fetching of possible attributes in Laravel5Helper.php haveProduct() method
2020-03-30 15:03:27 +02:00
Herbert Maschke
613b3ea523
Merge branch 'bagisto/master' into improve-have-product-faker
2020-03-30 14:43:30 +02:00
Annika Wolff
505014266e
fix still flickering locale factory
2020-03-30 11:05:45 +02:00
Florian Bosdorff
271c0e38ac
add option to set current channel
2020-03-27 16:07:53 +01:00
hexu
1b6fee90ef
Add repository cacheable trait
...
self::findByField does not work for repository cache, so I change it to $this->findByField
2020-03-27 12:03:18 +08:00
Annika Wolff
8a2a84b1e6
get existing locale or create new one
2020-03-24 10:58:20 +01:00
SteffenMahler
85319272a2
add CartRuleCouponFactory
...
this is for testing purposes
2020-03-23 08:15:02 +01:00
ghermans
cea497812e
fixed typo
2020-03-23 04:51:32 +01:00
ghermans
bd6c3aa1df
Added dutch locale
2020-03-23 04:31:33 +01:00
Jitendra Singh
5902f0050c
Merge pull request #2681 from vivek-webkul/patch-41
...
[Updated: Shop & admin email setting added in configuration.]
2020-03-19 15:36:27 +05:30
Herbert Maschke
b8e4692114
refactor haveProduct() method to allow custom attribute handling
2020-03-18 14:59:10 +01:00
Jitendra Singh
001262e6de
Merge pull request #2688 from jitendra-webkul/1.0
...
Issue #2518 fixed
2020-03-18 17:19:27 +05:30
Jitendra Singh
893564977f
Issue #2518 fixed
2020-03-18 17:15:44 +05:30
Jitendra Singh
7b5930f8bc
Merge pull request #2686 from jitendra-webkul/1.0
...
Issue #2613 fixed
2020-03-18 14:54:31 +05:30
Jitendra Singh
663a679a5d
Merge pull request #2588 from Haendlerbund/order-workflow-improvements
...
Order workflow improvements and tests
2020-03-18 14:50:48 +05:30
Jitendra Singh
bc39a19f49
Issue #2613 fixed
2020-03-18 14:50:20 +05:30
Vivek
ad76426fb5
[Updated: Shop & admin email setting added in configuration.]
2020-03-17 16:10:47 +05:30
Vivek
e1ed114d74
[Updated: Core/Config.php modified.]
2020-03-16 13:13:57 +05:30
Herbert Maschke
c14b1c8946
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-12 16:26:27 +01:00
Jitendra Singh
00f8f7ddb0
Issue #2630 fixed
2020-03-11 16:45:06 +05:30
Herbert Maschke
e20bb9cc97
remove <<<<HEAD merge conflict marker artifact
2020-03-10 10:00:04 +01:00
Herbert Maschke
7a3a1726bc
Merge branch 'bagisto/master' into order-workflow-improvements
2020-03-06 15:50:26 +01:00
Jitendra Singh
010ae65691
Resolved conflicts
2020-03-06 16:02:52 +05:30
Jitendra Singh
955da20b45
Improved comments in code
2020-03-05 19:49:14 +05:30
Jitendra Singh
10db1838f2
Removed author information from every class
2020-03-05 19:28:42 +05:30
Jitendra Singh
d0fa3b2705
Replace DB alias with complete class name
2020-03-05 19:11:53 +05:30
Jitendra Singh
92261d4214
Improved comments in code
2020-03-05 19:07:08 +05:30
Jitendra Singh
a6ce67151f
Improved comments in code
2020-03-05 11:04:57 +05:30
shubhammehrotra.symfony@webkul.com
133dd6ebd4
velocity sidebar issue and default theme velocity update
2020-03-04 13:12:00 +05:30
Jitendra Singh
41e06d5dc5
Improved code style
2020-03-04 12:02:53 +05:30
Herbert Maschke
e094dfd09c
add additional assertions to OrderCest.php
2020-03-03 11:18:18 +01:00
Herbert Maschke
895978e600
finish testCheckoutAsCustomer
2020-03-02 09:08:51 +01:00
Herbert Maschke
781d360ce7
add setSession and invalidateSession helper methods
2020-03-02 08:24:51 +01:00
Herbert Maschke
3e9c68f01d
introduce prepareCart() to be able to do checkout tests [wip] [ci-skip]
2020-02-28 11:41:48 +01:00
Jitendra Singh
4a6ac73bb6
Improved code style
2020-02-28 15:55:53 +05:30
Jitendra Singh
05be7a070a
Improved code style
2020-02-27 13:33:03 +05:30
Jitendra Singh
7d2ff93f43
Resolve conflicts
2020-02-25 11:44:34 +05:30
Jitendra Singh
195eb82802
Replace else if with elseif
2020-02-24 17:49:12 +05:30
rahul shukla
8fa7bc8c10
Issue #2451 fixed
2020-02-24 13:45:11 +05:30
Jitendra Singh
5c696f8d00
Resolved conflicts
2020-02-21 19:36:17 +05:30
Annika Wolff
154a933dc6
Merge branch 'master' into fix-tax-handling
2020-02-20 17:19:28 +01:00
Jitendra Singh
5fb33d4fc9
Improved core package code style
2020-02-19 17:56:12 +05:30
Glenn Hermans
c034c23d10
Added euro currency symbol
2020-02-19 00:53:49 +01:00
Glenn Hermans
e13d767506
Added euro currency
2020-02-19 00:28:25 +01:00
rahulshukla-webkul
5bfe263e10
Revert "add improvements to locale determination on product creation"
2020-02-18 18:14:22 +05:30
Jitendra Singh
11e4004954
Merge pull request #2487 from vivek-webkul/patch-37
...
[Fixed: Currency event related code fixed. ]
2020-02-18 15:56:42 +05:30
Vivek Sharma
c1d7ab810d
[Fixed: Currency event related code fixed. ]
2020-02-18 15:49:19 +05:30
Jitendra Singh
7d161e31ef
Merge pull request #2373 from Haendlerbund/locale-improvements
...
add improvements to locale determination on product creation
2020-02-18 15:10:14 +05:30
Herbert Maschke
b0e37edd63
only send emails when configured so
2020-02-17 16:52:58 +01:00
Herbert Maschke
cdc292c196
enable all notifications by default
2020-02-17 16:44:13 +01:00
Herbert Maschke
a889b1f31f
add mail notification defaults (everything true) to Config/system.php
2020-02-17 16:25:14 +01:00
Herbert Maschke
5129507456
add mail notification defaults (everything true) to ConfigTableSeeder.php
2020-02-17 16:04:59 +01:00
Jitendra Singh
881027ca4e
Converted configuration boolean type to switch
2020-02-12 13:45:26 +05:30
Jitendra Singh
c78b76f3aa
Merge pull request #2432 from jitendra-webkul/1.0
...
Fixed intentation in CoreConfigRepository
2020-02-11 19:18:15 +05:30
Jitendra Singh
fab5cc7a4f
Fixed intentation in CoreConfigRepository
2020-02-11 19:13:39 +05:30
shubhammehrotra.symfony@webkul.com
afa4ea627c
Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
2020-02-11 17:50:03 +05:30
shubhammehrotra.symfony@webkul.com
d331c36bd8
misc. bug fixes
2020-02-11 17:49:48 +05:30
Jitendra Singh
0caa8010d2
Issue #2424 fixed
2020-02-11 16:37:10 +05:30
Jitendra Singh
9b738f60bb
Merge pull request #2375 from shivam-webkul/master
...
#2070 issue fixed
2020-02-11 10:50:51 +05:30
Herbert Maschke
d574ab1beb
Merge branch 'bagisto/master' into locale-improvements
2020-02-10 15:11:43 +01:00
rahul shukla
d39201c877
Issue #2377
2020-02-07 17:17:30 +05:30
shivam kumar
15a6a25256
#2070 issue fixed
2020-02-07 16:40:03 +05:30
Herbert Maschke
35a9e90780
add improvements to locale determination on product creation
2020-02-07 11:16:00 +01:00
Steffen Mahler
b94fc9fc8c
merge master and resolve conflicts
2020-02-07 10:44:04 +01:00
Steffen Mahler
e678a467fc
call collectTotals in saveCustomerAddress
2020-02-05 11:18:21 +01:00
rahul shukla
ff37467e70
Issue #2239
2020-02-05 12:06:16 +05:30
SteffenMahler
0380628fa3
Merge branch 'master' into fix-tax-handling
2020-02-04 17:51: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
Herbert Maschke
4833d9f8ec
obey the default channel that has been set in config/app.php
2020-02-03 13:34:05 +01:00
rahul shukla
ee97642b7a
Issue #2226
2020-02-03 13:39:13 +05:30
Annika Wolff
e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring
2020-01-31 09:41:58 +01:00
Florian Bosdorff
389b40fdce
Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid
2020-01-30 16:04:57 +01:00
Jitendra Singh
25d99cc10a
Merge pull request #2200 from jitendra-webkul/1.0
...
Issue #2176 , #2196 fixed
2020-01-29 16:40:54 +05:30
Jitendra Singh
813f61eeaa
Issue #2176 , #2196 fixed
2020-01-29 16:37:20 +05:30
Jitendra Singh
62060fcbea
Merge pull request #2193 from jitendra-webkul/1.0
...
Issue #1988 fixed
2020-01-29 12:53:02 +05:30
Jitendra Singh
b4dacd4db6
Added translation seeder to DatabaseSeeder class
2020-01-29 12:52:06 +05:30
Jitendra Singh
0b67488a0b
Issue #1988 fixed
2020-01-29 12:51:12 +05:30
Steffen Mahler
90e638582b
fix wrong product state in haveVirtualProduct
2020-01-28 16:49:26 +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
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
Jitendra Singh
0cd4a2678a
Merge pull request #1996 from Haendlerbund/introduce-api-token-columns-into-database
...
add missing api_token columns to database (table customers and admins)
2020-01-27 18:31:13 +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
MonaHartdegen
f54117aabf
removed test and factory (did not work properly)
2020-01-24 15:04:34 +01:00
MonaHartdegen
ccc2188ef1
merge bagisto master
2020-01-24 10:22:15 +01:00
Herbert Maschke
9cab15afcd
load core factories
2020-01-23 14:24:40 +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
Herbert Maschke
3017fa337d
add necessary packages/Webkul/Core/src/Database/Factories/LocaleFactory.php
2020-01-23 14:11:56 +01:00
Florian Bosdorff
db00689a5c
add basic backend tests
2020-01-23 13:11:47 +01:00
MonaHartdegen
806e3f93db
added ProductsIndexCest; added factories
2020-01-23 08:33:47 +01:00
Florian Bosdorff
478533ae60
fix laravel 6 compartibility of tests; remove duplicated pipeline execution
2020-01-22 08:14:06 +01:00
Florian Bosdorff
61d9b59e5f
Merge master into issue-1183/guest-checkout-configuration
2020-01-22 08:10:45 +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
Jitendra Singh
a606c06e11
Cart rule and catalog rule updated for laravel 6.0
2020-01-21 15:51:12 +05:30
rahul shukla
e3db0b164c
conflict resolve
2020-01-21 13:24:19 +05:30
Annika Wolff
132dd6c0f0
introduce guest checkout configuration
2020-01-17 14:42:47 +01:00
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
shubhammehrotra.symfony@webkul.com
ba355a6f31
passing data from slider repository instead of id
2020-01-16 16:22:00 +05:30
Herbert Maschke
d281aa373b
remove factories (except necessary ones) from this pull request, as we deliver them as a separate PR
2020-01-16 09:54:04 +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
shubhammehrotra.symfony@webkul.com
eab9fdebb0
fire event on creating/updating slider
2020-01-15 15:48:02 +05:30
Herbert Maschke
95e37044de
introduce some more factories and place them into the webkul core package to be available everywhere
2020-01-15 10:32:01 +01:00
Jitendra Singh
122debdf1b
Issue #1795 fixed
2020-01-13 13:43:53 +05:30
Jitendra Singh
e13a268fe0
Eager loaded translations for country and country state models
2020-01-10 17:50:17 +05:30
Jitendra Singh
c7449aed48
Transation models added for country and state
2020-01-08 18:59:36 +05:30
David Große
37a4f6adb6
ensure the api_token is being generated on customer/admin creation
2020-01-03 09:14:12 +01:00
David Große
be05a8aae9
add missing api_token columns to database (table users and admins)
2020-01-02 15:45:25 +01:00
rahul shukla
4b2088e66e
upgrade to laravel 6
2019-12-30 17:10:38 +05:30
rahul shukla
5c0843c470
upgrade to lavael 6.0
2019-12-27 13:30:05 +05:30
rahul shukla
23a15be1e0
compatible with laravel 5.8
2019-12-24 19:31:13 +05:30
jitendra
2380c1b597
Merged with master
2019-12-21 10:58:46 +05:30
jitendra
513b07e4cf
Added new cart rule and catalog rule
2019-12-21 10:55:32 +05:30
MonaHartdegen
f90bb1d7fd
merge bagisto/master; resolved conflicts; added unit tests for database logic
2019-12-13 13:43:22 +01:00
Dirk Helbert
02ca34affa
Take the fallback_locale from app.config when locale is not defined in shop
2019-12-01 22:59:16 +01:00
shubhammehrotra.symfony@webkul.com
26b85fca06
template correction
2019-11-29 19:03:30 +05:30
shubhammehrotra.symfony@webkul.com
c22e8f7c9c
Bagisto content added using post create-project event
2019-11-25 14:59:51 +05:30
Herbert
4261590102
add resources/manifest.php skeletons for Webkul packages
2019-11-13 12:02:56 +01:00
jitendra
658fab644a
Issue #1753 fixed
2019-11-12 11:27:23 +05:30
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 Singh
2af8157a81
Merge pull request #1725 from jitendra-webkul/jitendra
...
Issue #1724 fixed
2019-11-01 11:04:34 +05:30
jitendra
973332f6c0
Issue #1724 fixed
2019-11-01 11:03:40 +05:30
Jitendra Singh
1a9989ed91
Merge pull request #1708 from bosix/feature-1707
...
add option to allow params in menu.php
2019-10-31 19:18:46 +05:30
Jitendra Singh
9baf4cac3a
Merge pull request #1709 from prashant-webkul/bugs_patch_1
...
Added logo, favicon in fillable of channel model
2019-10-31 12:21:03 +05:30
Prashant Singh
e5082cca3b
Added logo, favicon in fillable of channel model
2019-10-30 10:40:12 +05:30
Florian Bosdorff
69854838eb
add option to allow params in menu.php
2019-10-29 11:43:03 +01:00
jitendra
ce52c1832e
Issue #1684 fixed
2019-10-23 18:45:48 +05:30
jitendra
937fda187f
Issue #1620 , #1671 fixed
2019-10-22 17:38:35 +05:30
jitendra
822b6014b4
Issue #1676 fixed
2019-10-22 11:03:42 +05:30
jitendra
2695e88630
Issues #1620 , #1671 fixed
2019-10-21 13:37:19 +05:30
Webkul
3819e6e2ed
resolved issue #1522
2019-10-10 13:35:41 +05:30
Webkul
baad7ecb0a
Footer links issue is resolved
2019-10-10 13:17:46 +05:30
jitendra
5e754cbdfe
Resoloved conflicts
2019-10-09 17:12:57 +05:30
Prashant Singh
3bd2fd571d
Fixed issue #1539
2019-10-03 10:57:07 +05:30
rahul shukla
58331043e9
translatable package update
2019-09-20 14:49:53 +05:30
CodeInnovers
3d03bc099c
fixed issue #1460
2019-09-15 23:33:35 +05:30
jitendra
d8403bf162
Fixed exchange rate exception
2019-09-06 15:48:59 +05:30
jitendra
0b22ca7ad1
Error added to accordian if closed
2019-09-06 14:00:10 +05:30
jitendra
0f2876a1da
Conflict resolved in ChannelController
2019-09-05 17:01:17 +05:30
rahul shukla
ddf754e2a7
Issue #1384
2019-09-05 16:41:26 +05:30
jitendra
45f1ea4b83
Merge with master
2019-09-04 15:05:03 +05:30
Prashant Singh
6693a443d3
Removed latest flag check from prettus l5 repository
2019-09-04 14:00:45 +05:30
Prashant Singh
0468a1fdd6
Changes in core repository made
2019-09-04 13:36:34 +05:30
jitendra
557cbb1db1
Bundle add to cart added
2019-08-30 17:09:15 +05:30
Prashant Singh
b570bf229b
CMS pages seeder implemented and now seeder generates all prebuilt pages that were listed in footer quicklinks
2019-08-24 15:57:09 +05:30
Prashant Singh
c856ef55ea
Added entry for CMS in core's concord.php
2019-08-23 16:43:53 +05:30
Prashant Singh
05c5425c96
Added home page SEO under channel edit and create forms and fixed issue #1319
2019-08-21 13:38:07 +05:30
Jitendra Singh
fbf5da570e
Merge pull request #1318 from prashant-webkul/development
...
Development
2019-08-20 12:07:58 +05:30
Prashant Singh
0ea994502d
Fixed issues with Carbon instance and applied redirect to catalog rule index after applying rules
2019-08-20 11:46:20 +05:30
jitendra
e2bd18e916
Resolved conflicts
2019-08-19 16:01:38 +05:30
jitendra
29e4851bfb
Group product added
2019-08-19 15:00:24 +05:30
Jitendra Singh
59cfd13795
Merge pull request #1307 from prashant-webkul/development
...
Development
2019-08-16 17:50:18 +05:30
Prashant Singh
bd6e0c9345
Structural changes in CMS pages. Fixed bugs #1300 , #1295
2019-08-16 17:43:58 +05:30
Hossein
33977ffd94
Create Persian language file
2019-08-10 10:27:40 +04:30
Prashant Singh
8b78105ed9
Removed dead code
2019-08-09 18:52:01 +05:30
Prashant Singh
6a8bb7982d
Base sync
2019-08-06 14:37:03 +05:30
moe2566
e038416f55
Update 2019_07_23_033128_alter_locales_table.php
2019-07-23 19:22:03 -04:00
Moshe Lustigman
a0ba845e37
Add text direction configuration for locales
2019-07-23 18:05:57 -04:00
Prashant Singh
c6bc5ba1c3
Added support for fixer for fetching rates
2019-07-15 18:24:36 +05:30
Prashant Singh
5f08f2b9f4
Fixed sort order for configuration in admin panel
2019-07-14 00:46:33 +05:30
Prashant Singh
f8c774b3a5
Started with convert x to product id for cart rules
2019-07-13 15:23:27 +05:30
rahul shukla
f9e9dfbae1
slider delete issue
2019-07-08 17:10:42 +05:30
jitendra
1fd25cfc92
Added currency symbol in currencies table
2019-07-05 11:46:45 +05:30
jitendra
318857b785
Now images will be deleted too if the model gets deleted
2019-07-01 19:42:12 +05:30
jitendra
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
jitendra
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
Prashant Singh
1a262e0f27
Fixed some bugs in cart rules
2019-06-25 12:27:13 +05:30
Prashant Singh
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
Prashant Singh
6da603530e
Cart rule inside promotions, various improvements and fixes. ( #964 )
...
* Some syntax issue fixes
* Adding discount things inside promotions in admin
* routes updated for creating discount rules
* fixed customer profile redirect parameter issue
* added cart and catalog rule routes to admin section
* migrations for discount almost to be finished, final revision left
* migrations for discounts complete
* catalog rule form underway
* catalog rule
* Made some dynamic form fields in catalog rule create form
* made some changes for custom validations used in ProductForm request class
* working on prepopulating the values fields in conditions
* need another revisit on discount rules tables and then prepare for actions
* removed discounts table
* catalog rule form changed to muliti attribute set for single condition
* new icons added for promotion and customer note. new action for customer added to take notes on the customers
* catalog and cart rule designs stable, now moving towards validations on client side and backend
* catalog rules migrations added
* catalog rule models added with contracts and proxies
* fixed customer group bug in customer registration controller
* fixed customer registration bug due to last fix
* fixed product card image not found issue
* catalog rule translations added
* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.
* making cart attributes for cart rules
* Added more fields for cart rules
* working on conditions for cart rule form
* minor changes in migrations related to price rules
* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel
* part of conditions on the cart rule form added
* daily sync
* cart rate migrations updated
* Added select and multi select attributes options fetching with ajax on catalog rule form
* changed some migrations and data being populated at runtime inside catalog rule form
* catalog rule create complete, migrations changes, translations added
* catalog rule edit form complete
* catalog rule form complete, now moving towards catalog rule products
* added delete functionality for catalog rules
* added cart rule preferences for coupon codes
* cart rule submission problem due to repository issue
* Cart rule form and migrations complete
* Models and Repositories updated for cart rule usage
* base sync with master
* designing process to get suitable discount rules
* cart rule form completed
* added helpers in cart and discount to apply rules on cart at checkout or not
* cart rule coupon implementation in progress for discount coupon in shop checkout pages
* cart rules working
* added coupon box on checkout screen
* removed the conditions empty bug
* Nearing to completion of coupon based rules
* made some changes in cart rule coupon application on checkout related to new designs
* some bug fixes
* calculation for automatic cart rules complete
* non couponable cart rules implemented, now moving on to binding them on frontend
* some conditions improvements in couponable cart rules
* some bug fixes
* removed some bugs from summary blade for cart rule
* added the table for cart rule cart for managing rules with cart and removed various bug fixes
* some bug fixes
* Removed bugs and added coupon based cart rule removal functionality
* some bug fixes
* cart rule labels refactoring in midway
* Cart rule labels bug fixed
* removed margin classes from shop to UI
* Refactoring cart rule on front end
* added checks
* Discount rule implemented.
* cart rule bug fixes
* provision to remove the couponable and non couponable rule had been added
* Cart rule frontend work done
* altered some frontend variables on onepage checkout
* Altered cart rules to some extent
2019-06-10 13:19:05 +05:30
rahul shukla
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
jitendra
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
jitendra
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
rahul shukla
439652699e
issue #836
2019-04-17 19:20:07 +05:30
jitendra
700a2951e6
added related products and up sells to the product view page
2019-04-16 15:57:38 +05:30
Jitendra Singh
3984d92fad
Merge pull request #828 from prashant-webkul/development
...
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
Prashant Singh
1aa9bf78aa
Removed unforced controller file from attribute package's Repositories directory
2019-04-16 14:41:12 +05:30
Prashant Singh
af88e8951a
Unnecessary Tax models removed from core, were originally moved from core to Tax module
2019-04-16 14:39:30 +05:30
Prashant Singh
ca7a5e4a6f
Changed the moduleServiceProvider registration back in concord config file.
2019-04-15 16:37:25 +05:30
Prashant Singh
1ec1c5d83c
fixed some bugs
2019-04-09 13:29:31 +05:30
Prashant Singh
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
Prashant Singh
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
rahul shukla
dbde05e0cd
change in delete query
2019-04-09 12:05:52 +05:30
Prashant Singh
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
rahul shukla
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
rahul shukla
257dfc8b1e
rtl css for product list & currency capital
2019-03-29 16:48:00 +05:30
Prashant Singh
2b17cdb7fd
fixed issue #713
2019-03-19 13:24:28 +05:30
Prashant Singh
97da404216
default channel now getting checked with admin
2019-03-19 13:22:06 +05:30
Jitendra Singh
c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
...
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
jitendra
218ef7a85f
Added getCurrentLocale function in Core.php
2019-03-14 18:24:02 +05:30
rahul shukla
a887cf8b92
slider controller name issue
2019-03-14 17:05:18 +05:30
Jitendra Singh
45afd5652e
Merge pull request #681 from cagartner/pt-br-translation
...
Added pt-br translation
2019-03-12 17:57:37 +05:30
Carlos Augusto Gartner
2e2d7d7642
Added pt-br translation
2019-03-12 09:19:27 -03:00
jitendra
99e866d055
Fixed slider controller namespace issue
2019-03-12 16:03:57 +05:30
Jitendra Singh
4dc7ef649c
Merge pull request #673 from prashant-webkul/development
...
disabled side menu toggle for admin, created configuration for produc…
2019-03-12 09:57:57 +05:30
Prashant Singh
238c248852
Filterable checks implemented in datagrid
2019-03-11 19:36:15 +05:30
jitendra
91c55a7010
Modified Slider Model
2019-03-11 18:43:06 +05:30
jitendra
01f3cd7324
convertToBasePrice function added to Core class
2019-02-26 19:07:51 +05:30
jitendra
1ce5a957f9
convert price function issue fixed
2019-02-26 18:45:55 +05:30
rahul shukla
b019a248cf
interfaces & proxy class implemented
2019-02-18 13:00:40 +05:30
rahul shukla
e4bdf11a7d
lang added
2019-02-13 17:42:07 +05:30
Prashant Singh
7ba43a8fea
Dead code removed from currency seeder and model
2019-02-11 13:31:05 +05:30
Prashant Singh
e4dc9da03f
Removed the currency symbol table migration and seeder
2019-02-11 13:19:49 +05:30
Prashant Singh
b72123db51
Currency symbol table implemented with relationship with currency as a fallback if the symbol for the currency is not found
2019-02-08 16:05:50 +05:30
Prashant Singh
af5f039cb9
category creation fix
2019-02-08 15:32:33 +05:30
Prashant Singh
69aeb2a254
added a function to find the state by code and country code
2019-02-07 13:58:14 +05:30
jitendra
b0c96a0b02
Updated channel homepage content
2019-02-04 17:08:00 +05:30
rahul shukla
01d2d7cfcb
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-04 15:20:28 +05:30
rahul shukla
a741e0e570
config changes
2019-02-04 15:20:15 +05:30