0380628fa3
Merge branch 'master' into fix-tax-handling
2020-02-04 17:51:09 +01:00
53c5d107a6
Merge branch 'master' into small-bugfix-and-tiny-refactoring
2020-02-04 14:08:46 +01:00
7c661efd88
add unit tests, refactoring
2020-02-04 11:18:40 +01:00
cb5e3a47f6
fix tax handling, add functional cest for cart
2020-02-04 08:50:37 +01:00
4833d9f8ec
obey the default channel that has been set in config/app.php
2020-02-03 13:34:05 +01:00
ee97642b7a
Issue #2226
2020-02-03 13:39:13 +05:30
e7c29f40e2
Merge branch 'master' into small-bugfix-and-tiny-refactoring
2020-01-31 09:41:58 +01:00
389b40fdce
Merge branch 'bagisto/master' into add-channel-and-locale-filter-to-product-grid
2020-01-30 16:04:57 +01:00
25d99cc10a
Merge pull request #2200 from jitendra-webkul/1.0
...
Issue #2176 , #2196 fixed
2020-01-29 16:40:54 +05:30
813f61eeaa
Issue #2176 , #2196 fixed
2020-01-29 16:37:20 +05:30
62060fcbea
Merge pull request #2193 from jitendra-webkul/1.0
...
Issue #1988 fixed
2020-01-29 12:53:02 +05:30
b4dacd4db6
Added translation seeder to DatabaseSeeder class
2020-01-29 12:52:06 +05:30
0b67488a0b
Issue #1988 fixed
2020-01-29 12:51:12 +05:30
90e638582b
fix wrong product state in haveVirtualProduct
2020-01-28 16:49:26 +01:00
0d696c6b1a
merge remote-tracking branch 'bagisto/master' into small-bugfix-and-tiny-refactoring
2020-01-28 15:51:50 +01:00
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
5188b1b7f9
Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-28 08:15:11 +01:00
d125f9eba0
add reporting for try-catch-sections
2020-01-27 17:06:03 +01:00
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
e948b30e35
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-24 15:13:16 +01:00
f54117aabf
removed test and factory (did not work properly)
2020-01-24 15:04:34 +01:00
ccc2188ef1
merge bagisto master
2020-01-24 10:22:15 +01:00
9cab15afcd
load core factories
2020-01-23 14:24:40 +01:00
5ebb67dd81
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-23 14:18:17 +01:00
3017fa337d
add necessary packages/Webkul/Core/src/Database/Factories/LocaleFactory.php
2020-01-23 14:11:56 +01:00
db00689a5c
add basic backend tests
2020-01-23 13:11:47 +01:00
806e3f93db
added ProductsIndexCest; added factories
2020-01-23 08:33:47 +01:00
478533ae60
fix laravel 6 compartibility of tests; remove duplicated pipeline execution
2020-01-22 08:14:06 +01:00
61d9b59e5f
Merge master into issue-1183/guest-checkout-configuration
2020-01-22 08:10:45 +01:00
4596a77c07
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-21 11:36:26 +01:00
a606c06e11
Cart rule and catalog rule updated for laravel 6.0
2020-01-21 15:51:12 +05:30
e3db0b164c
conflict resolve
2020-01-21 13:24:19 +05:30
132dd6c0f0
introduce guest checkout configuration
2020-01-17 14:42:47 +01:00
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
ba355a6f31
passing data from slider repository instead of id
2020-01-16 16:22:00 +05:30
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
e0c2814f2e
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-15 15:29:55 +01:00
eab9fdebb0
fire event on creating/updating slider
2020-01-15 15:48:02 +05:30
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
122debdf1b
Issue #1795 fixed
2020-01-13 13:43:53 +05:30
e13a268fe0
Eager loaded translations for country and country state models
2020-01-10 17:50:17 +05:30
c7449aed48
Transation models added for country and state
2020-01-08 18:59:36 +05:30
37a4f6adb6
ensure the api_token is being generated on customer/admin creation
2020-01-03 09:14:12 +01:00
be05a8aae9
add missing api_token columns to database (table users and admins)
2020-01-02 15:45:25 +01:00
4b2088e66e
upgrade to laravel 6
2019-12-30 17:10:38 +05:30
5c0843c470
upgrade to lavael 6.0
2019-12-27 13:30:05 +05:30
23a15be1e0
compatible with laravel 5.8
2019-12-24 19:31:13 +05:30
2380c1b597
Merged with master
2019-12-21 10:58:46 +05:30
513b07e4cf
Added new cart rule and catalog rule
2019-12-21 10:55:32 +05:30
f90bb1d7fd
merge bagisto/master; resolved conflicts; added unit tests for database logic
2019-12-13 13:43:22 +01:00
02ca34affa
Take the fallback_locale from app.config when locale is not defined in shop
2019-12-01 22:59:16 +01:00
26b85fca06
template correction
2019-11-29 19:03:30 +05:30
c22e8f7c9c
Bagisto content added using post create-project event
2019-11-25 14:59:51 +05:30
4261590102
add resources/manifest.php skeletons for Webkul packages
2019-11-13 12:02:56 +01:00
658fab644a
Issue #1753 fixed
2019-11-12 11:27:23 +05:30
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
832c845091
Fixed issue #1543 and Cart rule related issues
2019-11-01 15:40:11 +05:30
2af8157a81
Merge pull request #1725 from jitendra-webkul/jitendra
...
Issue #1724 fixed
2019-11-01 11:04:34 +05:30
973332f6c0
Issue #1724 fixed
2019-11-01 11:03:40 +05:30
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
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
e5082cca3b
Added logo, favicon in fillable of channel model
2019-10-30 10:40:12 +05:30
69854838eb
add option to allow params in menu.php
2019-10-29 11:43:03 +01:00
ce52c1832e
Issue #1684 fixed
2019-10-23 18:45:48 +05:30
937fda187f
Issue #1620 , #1671 fixed
2019-10-22 17:38:35 +05:30
822b6014b4
Issue #1676 fixed
2019-10-22 11:03:42 +05:30
2695e88630
Issues #1620 , #1671 fixed
2019-10-21 13:37:19 +05:30
3819e6e2ed
resolved issue #1522
2019-10-10 13:35:41 +05:30
baad7ecb0a
Footer links issue is resolved
2019-10-10 13:17:46 +05:30
5e754cbdfe
Resoloved conflicts
2019-10-09 17:12:57 +05:30
3bd2fd571d
Fixed issue #1539
2019-10-03 10:57:07 +05:30
58331043e9
translatable package update
2019-09-20 14:49:53 +05:30
3d03bc099c
fixed issue #1460
2019-09-15 23:33:35 +05:30
d8403bf162
Fixed exchange rate exception
2019-09-06 15:48:59 +05:30
0b22ca7ad1
Error added to accordian if closed
2019-09-06 14:00:10 +05:30
0f2876a1da
Conflict resolved in ChannelController
2019-09-05 17:01:17 +05:30
ddf754e2a7
Issue #1384
2019-09-05 16:41:26 +05:30
45f1ea4b83
Merge with master
2019-09-04 15:05:03 +05:30
6693a443d3
Removed latest flag check from prettus l5 repository
2019-09-04 14:00:45 +05:30
0468a1fdd6
Changes in core repository made
2019-09-04 13:36:34 +05:30
557cbb1db1
Bundle add to cart added
2019-08-30 17:09:15 +05:30
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
c856ef55ea
Added entry for CMS in core's concord.php
2019-08-23 16:43:53 +05:30
05c5425c96
Added home page SEO under channel edit and create forms and fixed issue #1319
2019-08-21 13:38:07 +05:30
fbf5da570e
Merge pull request #1318 from prashant-webkul/development
...
Development
2019-08-20 12:07:58 +05:30
0ea994502d
Fixed issues with Carbon instance and applied redirect to catalog rule index after applying rules
2019-08-20 11:46:20 +05:30
e2bd18e916
Resolved conflicts
2019-08-19 16:01:38 +05:30
29e4851bfb
Group product added
2019-08-19 15:00:24 +05:30
59cfd13795
Merge pull request #1307 from prashant-webkul/development
...
Development
2019-08-16 17:50:18 +05:30
bd6e0c9345
Structural changes in CMS pages. Fixed bugs #1300 , #1295
2019-08-16 17:43:58 +05:30
33977ffd94
Create Persian language file
2019-08-10 10:27:40 +04:30
8b78105ed9
Removed dead code
2019-08-09 18:52:01 +05:30
6a8bb7982d
Base sync
2019-08-06 14:37:03 +05:30
e038416f55
Update 2019_07_23_033128_alter_locales_table.php
2019-07-23 19:22:03 -04:00
a0ba845e37
Add text direction configuration for locales
2019-07-23 18:05:57 -04:00
c6bc5ba1c3
Added support for fixer for fetching rates
2019-07-15 18:24:36 +05:30
5f08f2b9f4
Fixed sort order for configuration in admin panel
2019-07-14 00:46:33 +05:30
f8c774b3a5
Started with convert x to product id for cart rules
2019-07-13 15:23:27 +05:30
f9e9dfbae1
slider delete issue
2019-07-08 17:10:42 +05:30
1fd25cfc92
Added currency symbol in currencies table
2019-07-05 11:46:45 +05:30
318857b785
Now images will be deleted too if the model gets deleted
2019-07-01 19:42:12 +05:30
366a5fdd20
Refactor code standard
2019-07-01 17:03:36 +05:30
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
1a262e0f27
Fixed some bugs in cart rules
2019-06-25 12:27:13 +05:30
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
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
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
580d3ddf65
Resolve conflict
2019-04-18 12:56:36 +05:30
e99daf28e2
Issue #834 fixed
2019-04-18 12:52:51 +05:30
439652699e
issue #836
2019-04-17 19:20:07 +05:30
700a2951e6
added related products and up sells to the product view page
2019-04-16 15:57:38 +05:30
3984d92fad
Merge pull request #828 from prashant-webkul/development
...
Development
2019-04-16 15:46:32 +05:30
a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
...
Issue #803 fixed
2019-04-16 15:41:39 +05:30
eb00f36835
Issue #803 fixed
2019-04-16 15:40:58 +05:30
1aa9bf78aa
Removed unforced controller file from attribute package's Repositories directory
2019-04-16 14:41:12 +05:30
af88e8951a
Unnecessary Tax models removed from core, were originally moved from core to Tax module
2019-04-16 14:39:30 +05:30
ca7a5e4a6f
Changed the moduleServiceProvider registration back in concord config file.
2019-04-15 16:37:25 +05:30
1ec1c5d83c
fixed some bugs
2019-04-09 13:29:31 +05:30
1ca1ae5b61
Changed responses for all backend destroy functions and removed dead commented code
2019-04-09 13:17:19 +05:30
b3bf66c6e2
Base sync with master
2019-04-09 12:53:31 +05:30
dbde05e0cd
change in delete query
2019-04-09 12:05:52 +05:30
6a4cb016c4
fixed issue #750
2019-04-09 06:31:52 +05:30
4bd89950ce
change update & delete query in controller & comment added
2019-04-08 16:48:43 +05:30
257dfc8b1e
rtl css for product list & currency capital
2019-03-29 16:48:00 +05:30
2b17cdb7fd
fixed issue #713
2019-03-19 13:24:28 +05:30
97da404216
default channel now getting checked with admin
2019-03-19 13:22:06 +05:30
c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
...
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
218ef7a85f
Added getCurrentLocale function in Core.php
2019-03-14 18:24:02 +05:30
a887cf8b92
slider controller name issue
2019-03-14 17:05:18 +05:30
45afd5652e
Merge pull request #681 from cagartner/pt-br-translation
...
Added pt-br translation
2019-03-12 17:57:37 +05:30
2e2d7d7642
Added pt-br translation
2019-03-12 09:19:27 -03:00
99e866d055
Fixed slider controller namespace issue
2019-03-12 16:03:57 +05:30
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
238c248852
Filterable checks implemented in datagrid
2019-03-11 19:36:15 +05:30
91c55a7010
Modified Slider Model
2019-03-11 18:43:06 +05:30
01f3cd7324
convertToBasePrice function added to Core class
2019-02-26 19:07:51 +05:30
1ce5a957f9
convert price function issue fixed
2019-02-26 18:45:55 +05:30
b019a248cf
interfaces & proxy class implemented
2019-02-18 13:00:40 +05:30
e4bdf11a7d
lang added
2019-02-13 17:42:07 +05:30
7ba43a8fea
Dead code removed from currency seeder and model
2019-02-11 13:31:05 +05:30
e4dc9da03f
Removed the currency symbol table migration and seeder
2019-02-11 13:19:49 +05:30
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
af5f039cb9
category creation fix
2019-02-08 15:32:33 +05:30
69aeb2a254
added a function to find the state by code and country code
2019-02-07 13:58:14 +05:30
b0c96a0b02
Updated channel homepage content
2019-02-04 17:08:00 +05:30
01d2d7cfcb
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-02-04 15:20:28 +05:30
a741e0e570
config changes
2019-02-04 15:20:15 +05:30
639d4b1581
Issues #353 , #447 , #530 , #522 fixed
2019-02-04 14:56:13 +05:30
41d3f74fc1
configuration changes
2019-01-31 17:04:32 +05:30
7dae5da461
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-30 21:26:07 +05:30
SteffenMahler
Annika Wolff
Steffen Mahler
Herbert Maschke
rahul shukla
Florian Bosdorff
Jitendra Singh
Jitendra Singh
Florian Bosdorff
MonaHartdegen
Annika Wolff
shubhammehrotra.symfony@webkul.com
David Große
Dirk Helbert
Prashant Singh
CodeInnovers
Hossein
moe2566
Prashant Singh
Carlos Augusto Gartner