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
jitendra
639d4b1581
Issues #353 , #447 , #530 , #522 fixed
2019-02-04 14:56:13 +05:30
rahul shukla
41d3f74fc1
configuration changes
2019-01-31 17:04:32 +05:30
rahul shukla
7dae5da461
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-01-30 21:26:07 +05:30
rahul shukla
2f8178afc0
file & image field for configuration
2019-01-30 21:25:38 +05:30
jitendra
70c114d3a6
Channel homepage content updated in seeder
2019-01-29 18:32:10 +05:30
jitendra
209f73d46b
Issues #217 , #396 , #227 , #321
2019-01-29 16:05:43 +05:30
jitendra
230f9ff988
Channel inventories seeder added
2019-01-25 20:51:24 +05:30
Prashant Singh
67dbce6fa8
Product flat implementation working, now binding it with the product update evento to write the
2019-01-23 16:35:34 +05:30
jitendra
61c10dd48d
Category seeder added
2019-01-21 14:36:38 +05:30
rahul shukla
8c32a21521
export changes
2019-01-16 16:43:36 +05:30
rahul shukla
4747f8fb59
customer design fixex
2019-01-16 14:08:39 +05:30
jitendra
aae6593469
Coding standard updated
2019-01-15 17:24:41 +05:30
jitendra
a781594b10
Translations added for menu and acl lables
2019-01-15 16:03:55 +05:30
rahul shukla
b7d15d4d0e
validatio issue
2019-01-11 10:39:41 +05:30
rahul shukla
1e2d7418ca
merge with master
2019-01-04 19:13:53 +05:30
rahul shukla
33ac4c1319
multiselect for configuration
2019-01-04 11:13:24 +05:30
rahul shukla
b430d4d4b5
merge with master
2019-01-02 20:15:05 +05:30
rahul shukla
29ab4f1da9
merge with master
2018-12-31 18:51:42 +05:30
jitendra
c49e7b6e5f
Channel alter migration issue fixed
2018-12-31 18:49:06 +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
cb3da5fc08
Channel root category feature added
2018-12-31 16:34:26 +05:30
jitendra
9581082f56
Removed auth middleware from controllers
2018-12-27 17:05:05 +05:30
jitendra
336284ee6e
Refactor state grouping by country
2018-12-27 11:35:10 +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
rahul shukla
1e25226997
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-12-26 14:47:50 +05:30
rahul shukla
9bb9ae5ce7
configuration changes
2018-12-26 14:46:27 +05:30
jitendra
5916482f7c
Add fire event on every controller
2018-12-21 18:18:34 +05:30
jitendra
17480d8b67
Issue #365
2018-12-21 13:25:58 +05:30
jitendra
954502c571
Issues #353 , #354
2018-12-21 11:58:02 +05:30
jitendra
9654748f1f
Issue #348 fixed
2018-12-20 16:24:30 +05:30
prashant-webkul
0faf88a797
Issue fixed #329 , admin changing their details with entering the current password
2018-12-19 13:36:33 +05:30
prashant-webkul
3c8807e7e9
merge conflicts removed
2018-12-18 18:17:01 +05:30
rahul shukla
9cdc16a50b
conflict resolve
2018-12-18 13:39:15 +05:30
prashant-webkul
c4416bc228
Removed conflicts from the merge with the master
2018-12-18 11:09:54 +05:30
rahul shukla
b298a3973a
validation in shipping & payment methods and issue #308 & #295
2018-12-14 15:26:01 +05:30
jitendra
2decdeb194
Removed event from menu, acl, config creation
2018-12-14 13:56:05 +05:30
rahul shukla
8cd04be89c
shipping & payment methods
2018-12-14 11:56:52 +05:30
prashant-webkul
d9f0ddc89d
Fixed issues 314 and 315
2018-12-13 18:51:54 +05:30
jitendra
0bdd9e1a2a
Refactor Menu system and core config data system
2018-12-13 16:28:28 +05:30
jitendra
7f65c3327a
Modify menu system and added decimal validator
2018-12-12 15:09:20 +05:30
prashant-webkul
1e05840c7d
Regular merge with master
2018-12-07 15:44:03 +05:30
prashant-webkul
45903d3c0a
Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes
2018-12-07 14:45:31 +05:30
jitendra
9d41172512
Refactor core config system
2018-12-07 12:38:29 +05:30
rahul shukla
b78cc23797
shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable
2018-12-07 10:55:33 +05:30
prashant-webkul
48bece3531
datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also.
2018-12-03 13:41:35 +05:30
prashant-webkul
7fb67dc161
mass operations and datagrid operations normalization
2018-11-30 20:37:41 +05:30
prashant-webkul
5f81a79796
Subscription newsletter migration restored and subsctiption newsletter datagrid in admin
2018-11-29 18:05:56 +05:30
prashant-webkul
311701b00a
tax category sync fix and select rates fixed
2018-11-28 14:05:44 +05:30
jitendra
fafbcb432b
Issues #175 , #176 fixed and added bootstrap.js in main js file
2018-11-28 10:56:54 +05:30
prashant-webkul
bf63545895
Bug fix for slider content field, changed to text and datagrid invoices and shipments columns added a/c to relevancy and removed mass actions
2018-11-27 18:56:25 +05:30
jitendra
fb0079bf42
Fixed validation error messages
2018-11-27 10:16:35 +05:30
prashant-webkul
1c27444705
merged
2018-11-21 12:04:54 +05:30
prashant-webkul
8c12e35621
Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid
2018-11-16 17:21:10 +05:30
jitendra
c845fdddb8
Issues fixed
2018-11-13 15:43:09 +05:30
prashant-webkul
3a801a5d72
Pre Loaded
2018-11-05 10:25:05 +05:30
jitendra
b4e79a87ca
Editor added to the product edit page, slider form page and channel create and edit form
2018-10-30 16:54:24 +05:30
prashant-webkul
1cd59b4b86
Webkul copyright text, Search now working on product names only with a dedicated page for displaying results
2018-10-29 14:51:59 +05:30
prashant-webkul
e2c036ced0
Search and Bug fixes
2018-10-29 11:39:09 +05:30
prashant-webkul
2514d748b5
Slider Content Bug Fixed
2018-10-28 18:53:20 +05:30
prashant-webkul
7a157ee17d
Slider Backend Fixed
2018-10-28 16:30:15 +05:30
jitendra
9c8c9c2a97
Now compiled asset will store in publishable folder
2018-10-26 12:52:43 +05:30
rahul shukla
007f945b05
conflict resolve
2018-10-26 09:59:33 +05:30
jitendra
7c63dac032
Fixed remaining issues
2018-10-26 09:50:43 +05:30
rahul shukla
781b960fa8
reviews issue
2018-10-25 21:45:28 +05:30
jitendra
930cba9436
Issues fixed
2018-10-25 13:16:45 +05:30
jitendra
0f6bcfde49
Seeders added
2018-10-25 11:01:47 +05:30
rahul shukla
de0ea34e8a
conflict resolve
2018-10-23 17:24:27 +05:30
prashant-webkul
2c32f510b2
merged with master
2018-10-23 17:19:13 +05:30
JItendra Singh
56e8597c6f
Merge pull request #68 from bagisto/jitendra
...
Dashboard completed
2018-10-23 17:16:22 +05:30
jitendra
13ae5d58c0
Dashboard completed
2018-10-23 17:15:44 +05:30
rahul shukla
399ba55982
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-10-22 11:18:29 +05:30
rahul shukla
5dc60d0fe1
customer group
2018-10-22 11:17:42 +05:30
prashant-webkul
806ffb460f
Order Datagrid, Datagrid Currency Capabilities via wrapper and UI fixes in storefront navigation bar, admin panel menu item, datagrid actions checks before rendering of datagrid
2018-10-18 16:34:55 +05:30
prashant-webkul
40ecc72b04
Merge pull request #67 from bagisto/jitendra
...
Jitendra
2018-10-18 15:52:22 +05:30
jitendra
1d5e1f5a21
Cart issues fixed
2018-10-18 15:21:08 +05:30
JItendra Singh
6c0dfa6a96
Merge pull request #65 from bagisto/jitendra
...
Front currency switcher, currency edit page and locale edit page added
2018-10-18 13:49:45 +05:30
jitendra
12d68fcb57
Front currency switcher, currency edit page and locale edit page added
2018-10-18 13:49:03 +05:30
rahul shukla
b5be4cf320
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-10-18 10:33:45 +05:30
rahul shukla
dde2a626e6
laoder changes
2018-10-18 10:33:00 +05:30
prashant-webkul
3a1029290f
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-10-17 19:50:55 +05:30
prashant-webkul
8c7626b2b2
before merge
2018-10-17 19:50:25 +05:30
jitendra
b02d87626a
Get current channel code updated
2018-10-17 19:27:51 +05:30
prashant-webkul
84bc6c0c60
merged
2018-10-17 16:17:46 +05:30
prashant-webkul
11e7db8f85
Before merge with masteer
2018-10-17 16:03:57 +05:30
jitendra
b0a12d85a3
COnflict resloved
2018-10-17 16:03:25 +05:30
jitendra
faab00c3b8
Bug fixed
2018-10-17 16:00:31 +05:30
rahul shukla
541264f86a
Merge branch 'master' of https://github.com/bagisto/bagisto into rahul
2018-10-17 15:16:35 +05:30
jitendra
892bf53cc9
Channel logo and favicon implementation added
2018-10-17 15:15:18 +05:30
rahul shukla
b329567370
conflict
2018-10-17 15:14:22 +05:30
rahul shukla
8009b5c647
error & loader
2018-10-17 13:10:08 +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
jitendra
7f1675e37c
Order cancel implemented
2018-10-15 16:09:09 +05:30
rahul shukla
5cc562d972
reviews
2018-10-15 14:32:26 +05:30
jitendra
e92010f55f
Tax issue fixed
2018-10-12 18:34:15 +05:30
jitendra
1e16931ba3
Countries and States models added
2018-10-12 18:24:10 +05:30
rahul shukla
c857dde9f4
customer validation
2018-10-12 17:09:19 +05:30
rahul shukla
8544d9705a
conflict
2018-10-12 17:01:14 +05:30
prashant-webkul
7319a8c40a
Merge branch 'master' of https://github.com/bagisto/bagisto into prashant
2018-10-12 13:53:22 +05:30
jitendra
71ea17d9d7
Performence Optimized
2018-10-12 13:52:06 +05:30
prashant-webkul
f28f716d9f
Bug fixes across the system
2018-10-11 19:55:59 +05:30
prashant-webkul
d26758e49a
Merged
2018-10-10 16:13:51 +05:30
jitendra
426933a4bb
Home new products
2018-10-10 11:20:47 +05:30
prashant-webkul
b6df4e1dc8
Merged with master
2018-10-10 10:19:30 +05:30