Commit Graph

1186 Commits

Author SHA1 Message Date
peternuernberger af28c35bf7 Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets 2019-12-30 09:32:49 +01:00
rabol 029971e9cf Fix bug that prevent user from signing up for newsletter 2019-12-28 15:36:40 +01:00
Annika Wolff d47201af75 bugfixed quantity update when showQuantityBox is false 2019-12-27 14:41:32 +01:00
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
Jitendra Singh 3b1b3e819f
Merge pull request #1945 from rahulshukla-webkul/development
Development
2019-12-24 13:12:52 +05:30
Jitendra Singh a3aa23fcbc
Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes
Allow empty option for attributes
2019-12-24 13:12:22 +05:30
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
jitendra 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 2d0b26d78a Added changes on core packages for discount 2019-12-21 13:01:16 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
rahul shukla 370480572f Issue 1802. 2019-12-19 17:21:40 +05:30
shubhammehrotra.symfony@webkul.com 992d09e8d5 check guest customer configuration 2019-12-19 16:04:55 +05:30
shubhammehrotra.symfony@webkul.com cf837ba290 throw exception when session user is not available on product review page 2019-12-19 15:53:01 +05:30
Jitendra Singh d74e8e863c
Merge pull request #1907 from KevinLaveto/patch-1
The {length} didn't get properly formatted
2019-12-19 12:53:50 +05:30
David Große d667263313 add two events to profile index blade view 2019-12-18 16:26:38 +01:00
KevinLaveto 37ca3d6586
The {length} didn't get properly formatted
I don't know if this is completely correct since I don't know this language, but for my language it said
```
Veld "Wachtwoord" moet ten minste {length} tekens bevatten
```
So the length didn't get replaced. 

I think the locales.js needs to change
2019-12-18 10:16:35 +01:00
peternuernberger d92bb0ea72 Merge branch 'bagisto/master' into feature/update-npm-assets 2019-12-18 09:41:40 +01:00
Jitendra Singh 068b688e7c
Merge pull request #1785 from Haendlerbund/1244-url-structure-for-products-and-categories
1244 url structure for products and categories (SEO improvements)
2019-12-18 12:38:53 +05:30
Jitendra Singh c26bf6c820
Merge pull request #1701 from MattApril/env-fix
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
rahul shukla 2f8e319fb0 Issue #1232, default item in perpage and label of perpage 2019-12-16 18:56:02 +05:30
MonaHartdegen 2b0385c14e Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes 2019-12-13 14:12:14 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla 7321a2fc74 Issue #1821, price at review page 2019-12-12 19:44:54 +05:30
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
rahul shukla e8f0802b9f Issue #1878 2019-12-12 15:23:30 +05:30
MonaHartdegen 7b1378fded added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view 2019-12-12 10:32:51 +01:00
rahul shukla c6553ed238 conflict resolve 2019-12-12 14:20:17 +05:30
rahul shukla dbf404d13f Issue #1787 2019-12-11 15:25:19 +05:30
MonaHartdegen ebcae41f3c improved field size of url_path in DB, improved naming, update url_path of children on saving 2019-12-09 08:22:37 +01:00
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
MonaHartdegen 0eb9cfc86d added comment to db column; added @property-read to Category and CategoryTranslation model 2019-12-03 13:24:11 +01:00
MonaHartdegen 78a3c91c84 fixed bug in sql triggers 2019-12-02 16:30:24 +01:00
peternuernberger 57750b3864 prevent script break if there are no products 2019-12-02 11:46:13 +01:00
peternuernberger c1f648a17f excluded import statements 2019-12-02 11:41:02 +01:00
rahul shukla 8948aeaea7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-11-26 18:33:01 +05:30
rahul shukla 79d9a1d9b3 dtabase prefix added in raw query 2019-11-26 16:06:22 +05:30
MonaHartdegen e57cd8e552 added numbers to regex for products and categories route 2019-11-25 14:22:49 +01:00
Jitendra Singh 840290f0bb
Merge pull request #1782 from Haendlerbund/introduce-product-type-helper
introduce ProductType Helper
2019-11-22 17:05:21 +05:30
Jitendra Singh 5e3b18a865
Merge pull request #1702 from MattApril/payment-labels
Minor usability/accessability fix for payment type labels
2019-11-22 16:35:22 +05:30
MonaHartdegen c57c5d9b6f altered nav-menu to show correct category urls 2019-11-22 11:37:55 +01:00
Mona Hartdegen 25c2a15b65 introduced url structure for categories and products (SEO improvements) 2019-11-21 17:14:53 +01:00
Annika Wolff 9a43776cc0 introduce ProductType Helper 2019-11-21 16:56:21 +01:00
Jitendra Singh 58a0bad4c9
Merge pull request #1755 from KobbyKnight/master
Issue 1643 fix
2019-11-13 16:09:01 +05:30
jitendra 2446f56413 Issue #1746, #1271, #1735 fixed 2019-11-12 13:52:38 +05:30
KobbyKnight e91049ebf3 Issue 1643 fix 2019-11-11 16:28:47 +00:00
jitendra 08e87ccf8d Issue #1559 fixed 2019-11-05 16:23:43 +05:30
Jitendra Singh 6537f66441
Merge pull request #1739 from jitendra-webkul/jitendra
Issue #1732 fixed
2019-11-05 13:12:33 +05:30
jitendra 803957c894 Issue #1732 fixed 2019-11-05 13:11:11 +05:30
Jitendra Singh 98614d2fc2
Merge pull request #1738 from rahulshukla-webkul/development
default shipping and billing address
2019-11-05 12:49:24 +05:30
rahul shukla efcf0cd4b1 default shipping and billing address 2019-11-05 12:47:00 +05:30
Jitendra Singh ede889703e
Merge pull request #1737 from jitendra-webkul/jitendra
Issue #1347 fixed
2019-11-05 12:45:22 +05:30
jitendra 8347e1770b Issue #1347 fixed 2019-11-05 12:44:26 +05:30
Jitendra Singh 8ccb72f1d3
Merge pull request #1727 from prashant-webkul/bugs_patch_1
Fixed issue undefined variable  at checkout
2019-11-01 16:04:40 +05:30
Prashant Singh be34e104a4 Fixed issue undefined variable at checkout 2019-11-01 16:00:11 +05:30
jitendra b72b79032a Issue #1711 fixed 2019-10-31 17:48:37 +05:30
jitendra a15ded74b5 Removed accordian from customer profile view 2019-10-31 17:16:42 +05:30
jitendra 8346f424cb Resolve conflict 2019-10-31 13:51:53 +05:30
jitendra 163ce17e34 Issue #1662 fixed 2019-10-31 13:50:17 +05:30
Jitendra Singh 2a00d797ca
Merge pull request #1703 from phillipcodes/bugfix-979/image-scaling
#979 fix image scaling issues
2019-10-29 12:31:19 +05:30
jitendra 8b29a7f8e0 Wishlist language moved to account section and added downloadable products language to other locales 2019-10-29 12:23:28 +05:30
phillipmohr b5178cf013 fix image scaling issues 2019-10-28 16:17:48 +01:00
Matt April abbb79a16c Fixed payment type not properly wrapped in labels (minor usability/accessability fix) 2019-10-27 11:10:18 -04:00
Matt April 3ebdde7681 Replaced direct env references of MAIL_SHOP_FROM with config file references. Also enabled optional usage of MAIL_FROM_NAME. 2019-10-26 11:09:46 -04:00
Matt April 54babf9079 Moved ADMIN_MAIL_TO into mail config 2019-10-26 11:07:41 -04:00
Jitendra Singh b0b2e26ef2
Merge pull request #1365 from KarimQaderi/patch-5
change route pages to page
2019-10-24 10:37:41 +05:30
Jitendra Singh 4fcff1e111
Merge pull request #1650 from shivam-webkul/shivam
[Bug Fixed #1219 ] & [Enhancement #1182]  Fixed
2019-10-24 10:36:53 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
shivam kumar 101785cbf7 minor chanegs 2019-10-23 13:06:34 +05:30
Jitendra Singh 02f0d004b0
Merge pull request #1651 from naresh-webkul/development
Bug Fixed #1645: No confirm password action when customer is deleting…
2019-10-22 16:01:28 +05:30
Jitendra Singh ea2f91e704
Merge pull request #1663 from MattApril/dev
Fixed duplicate view_render_event for product descriptions
2019-10-22 12:58:08 +05:30
shivam kumar ce6766b305 design changes and fixed minor issue 2019-10-21 15:37:51 +05:30
naresh verma 2d2302c398 resolve conflicts 2019-10-21 13:38:29 +05:30
naresh verma 33e8445ba8 added translation [issue fixed #1645] 2019-10-21 13:26:23 +05:30
Jitendra Singh 75eeddc1b1
Merge pull request #1665 from rumansaleem/fix-hardcoded-bagisto
Replace hardcoded 'Bagisto' with application name from config.
2019-10-21 12:01:26 +05:30
Amritanshu 5baa1ede20 Replace SERVER['REQUEST_URI'] with Larvel's request object #1251 2019-10-19 15:35:05 +05:30
Ruman Saleem bb4d29d35e fix typo 2019-10-19 13:59:47 +05:30
Ruman Saleem b8967a5c22 Replace hardcoded 'Bagisto' with application name - fixes #1614 2019-10-19 13:51:00 +05:30
Matt April 27a9a32f14 Fixed duplicate view_render_event for product descriptions - changed from .before to .after 2019-10-18 17:54:43 -04:00
shivam kumar fd8a1fb851 #1182 fixed 2019-10-18 18:43:38 +05:30
prateek srivastava 8fc60b0a4e issue #1613 fixed 2019-10-18 12:13:06 +05:30
shivam kumar eaf82987cf #1219 fixed 2019-10-17 17:47:48 +05:30
naresh verma 28ed55d711 Bug Fixed #1645: No confirm password action when customer is deleting his profile 2019-10-17 17:24:01 +05:30
rahul shukla 819807b017 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-10-15 19:06:03 +05:30
rahul shukla 4761c64c6f update cart method name change for API 2019-10-15 19:05:46 +05:30
jitendra 94d7289927 Issue #1631 fixed 2019-10-15 18:59:54 +05:30
jitendra 4657430da1 Issue #1629 fixed 2019-10-15 13:10:53 +05:30
Jitendra Singh 8d33d74f85
Merge pull request #1616 from jitendra-webkul/jitendra
Purchased downloadable product grid date filter issue fixed
2019-10-14 09:52:43 +05:30
jitendra 21fcc50597 Purchaes downloadable product grid date filter issue fixed 2019-10-14 09:51:22 +05:30
Jitendra Singh d810f7c75b
Merge pull request #1615 from jitendra-webkul/jitendra
Issue #1611 fixed
2019-10-14 09:19:11 +05:30
jitendra 1dfe3a513d Issue #1611 fixed 2019-10-14 09:18:15 +05:30
Jitendra Singh d184c375cc
Merge pull request #1601 from jitendra-webkul/jitendra
Issue #1587 fixed
2019-10-11 12:19:02 +05:30
jitendra 41a78c87b3 Issue #1587 fixed 2019-10-11 12:18:19 +05:30
Jitendra Singh 5357578944
Merge pull request #1599 from jitendra-webkul/jitendra
Issue #1568 fixed
2019-10-11 11:47:18 +05:30
jitendra a3bb10a8b6 Issue #1568 fixed 2019-10-11 11:46:19 +05:30
Jitendra Singh 028a7db2bc
Merge pull request #1597 from jitendra-webkul/jitendra
Issue #1571 fixed
2019-10-11 11:21:52 +05:30
jitendra 195330c192 Issue #1571 fixed 2019-10-11 11:19:46 +05:30
Jitendra Singh f88d986d6a
Merge pull request #1589 from jitendra-webkul/jitendra
Issue #1585 fixed
2019-10-10 19:39:00 +05:30
jitendra 121c7c7e36 Issue #1585 fixed 2019-10-10 19:37:31 +05:30
Jitendra Singh 5bb6e1870c
Merge pull request #1577 from jitendra-webkul/jitendra
Issue #1573 fixed
2019-10-10 13:23:47 +05:30
jitendra e21fb3d6cd Issue #1573 fixed 2019-10-10 13:21:46 +05:30
Jitendra Singh 4e0a5847d5
Merge pull request #1521 from Sopizhenko/master
Fix for issue #1433
2019-10-10 13:16:23 +05:30
Jitendra Singh e85f07af08
Merge pull request #1564 from rahulshukla-webkul/development
Fixed issue #1563
2019-10-10 13:03:59 +05:30
Jitendra Singh 0223ffda8e
Merge pull request #1570 from jitendra-webkul/jitendra
Updated refund for new product types
2019-10-10 12:34:05 +05:30
jitendra b707a855fc Updated refund for new product types 2019-10-10 12:33:05 +05:30
Jitendra Singh 3c9ef6ee45
Merge pull request #1558 from marcmascarell/patch-1
Spanish translation for Shop module
2019-10-10 11:06:21 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
rahul shukla 6752476317 conflict resolve 2019-10-09 19:29:07 +05:30
jitendra f8db35504c Fixed checkout issue 2019-10-09 19:21:02 +05:30
rahul shukla 28c65329d7 Checkout conflict resolve 2019-10-09 18:45:39 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
Marc Mascarell c011d19c39
Spanish translation for Shop module 2019-10-09 11:22:12 +02:00
rahul shukla 878c0eb8e5 Issue #1463 2019-10-07 16:36:16 +05:30
rahul shukla f3bd135cec change way for default shipping & payment method selection 2019-10-01 16:33:18 +05:30
rahul shukla d27dfd1c1e change way for default shipping & payment method selection 2019-10-01 16:26:49 +05:30
Jitendra Singh 3660c1e2e2
Merge pull request #1531 from melorbany/hotfix/arabic_translation
Update Arabic localization text.
2019-10-01 10:06:38 +05:30
Jitendra Singh b64c7241ba
Merge pull request #1533 from prashant-webkul/development
Fixed issue #1532
2019-10-01 10:06:11 +05:30
Webkul 109c99f3da Made footer text content optional from configuration apart from custom content also 2019-09-30 15:57:35 +05:30
Mohamed Elorbany a048f9d76a Update Arabic localization text. 2019-09-29 13:38:47 +03:00
rahul shukla 5d63416e95 localization message improvement 2019-09-27 19:46:14 +05:30
Sopizhenko 9569b38b19
fix the problem with layered navigation on pages 2019-09-26 11:29:44 +03:00
Prashant Singh 8f34c70ab9 Fixed issue with undefined variable meta title 2019-09-24 19:12:51 +05:30
Prashant Singh 2a52d24093 Null coalesce for title on bagisto's home page 2019-09-24 17:34:19 +05:30
Prashant Singh cc30b5849c Fixed order of page title section 2019-09-24 14:27:52 +05:30
Prashant Singh 626597fcb5 Home page title is mapped with channel's meta title 2019-09-24 12:43:49 +05:30
jitendra 7a56f5761f Refund feature added 2019-09-20 19:36:41 +05:30
Jitendra Singh fb43bb1752
Merge pull request #1488 from jitendra-webkul/refund
Front order item grandtotal issue fixed
2019-09-19 15:48:39 +05:30
jitendra 46a29488d0 Front order item grandtotal issue fixed 2019-09-19 15:48:01 +05:30
Jitendra Singh cee52398a1
Merge pull request #1478 from jitendra-webkul/refund
Refund
2019-09-18 19:12:40 +05:30
jitendra 84969849d1 Added translations 2019-09-18 19:12:05 +05:30
Jitendra Singh f99b88f41f
Merge pull request #1477 from jitendra-webkul/refund
Translation added
2019-09-18 19:03:27 +05:30
jitendra 382dee4da2 Translation added 2019-09-18 19:02:34 +05:30
Jitendra Singh 7619ede6a2
Merge pull request #1476 from jitendra-webkul/refund
Refund system completed
2019-09-18 18:59:48 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
rahul shukla d3c68573d2 locale based error message 2019-09-16 13:53:56 +05:30
rahul shukla 4ddcaed81d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-16 13:52:04 +05:30
rahul shukla 62b2a3f9c3 locale based error message 2019-09-16 13:51:47 +05:30
Jitendra Singh 58306e3252
Merge pull request #1448 from prateek-webkul/master
Issue #1442 fixed
2019-09-16 10:19:58 +05:30
rahul shukla 53030b2a21 conditon added for checkout back button 2019-09-13 17:02:46 +05:30
rahul shukla 00b83b1398 change defualt payment method & oderder number in customer invoice 2019-09-13 15:54:05 +05:30
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
rahul shukla 48d86f05e8 Issue #1260 & mail logo 2019-09-13 15:04:29 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
prateek srivastava 98792912d8 translation added 2019-09-13 12:50:06 +05:30
prateek srivastava 9794fc659e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-13 12:45:07 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 5fd72de3a9 Issue #1249 2019-09-12 18:31:40 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
Jitendra Singh 9a443b6f3b
Merge pull request #1446 from prashant-webkul/development
Command line installer fix
2019-09-12 15:52:58 +05:30
Prashant Singh 2c928ea25c Fixed issue #1288 2019-09-12 15:23:29 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
Jitendra Singh e604037adf
Merge pull request #1445 from prashant-webkul/development
Fixed issue #1288 #1434 #1444
2019-09-12 11:14:27 +05:30
Prashant Singh 6c82802371 Fixed issues #1444 & #1434 2019-09-11 20:10:59 +05:30
rahul shukla d9a0c6078e order number 2019-09-11 17:47:52 +05:30
rahul shukla aab8bd1479 order number 2019-09-11 17:34:11 +05:30
Jitendra Singh ac48a20822
Merge pull request #1343 from lemmeV/master
added configurable order numbers
2019-09-11 15:51:30 +05:30
jitendra 484fb56e54 Price added to downloadable product links 2019-09-11 13:46:33 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Jitendra Singh b3ca0200ac
Merge pull request #1387 from codeinnovers/master
fixed issue  #1371
2019-09-11 13:13:13 +05:30
jitendra 128dde536e Fixed issues of bundle, downloadable products 2019-09-10 19:22:11 +05:30
jitendra b5163fe9b3 Fixed Not getting sample link for file if url is selected 2019-09-10 15:06:34 +05:30
rahul shukla 403a9dda4c wishlist icon is active when item is already in wishlist 2019-09-10 13:10:58 +05:30
rahul shukla 599bffdce7 wishlist icon is active when item is already in wiahlist 2019-09-10 12:35:52 +05:30
jitendra 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
jitendra 10b706c1d7 Merged with master 2019-09-09 14:46:43 +05:30
Jitendra Singh 9d5032d619
Merge pull request #1424 from rahulshukla-webkul/development
Development
2019-09-09 13:18:18 +05:30
rahul shukla 98df7f25f7 Issue #1256 2019-09-09 12:57:28 +05:30
Prashant Singh 64f5bef341 Category filters : price filter was always active, turned active value to false 2019-09-08 01:37:04 +05:30
rahul shukla 8ce93244de Issue #1263 2019-09-07 15:08:26 +05:30
jitendra 8545d5ef3c Unlimited download link issue fixed 2019-09-06 19:46:25 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
jitendra 7b73abac95 Order view blade updated 2019-09-06 11:43:14 +05:30
rahul shukla 7d9c785f7d issue #1226 2019-09-05 18:06:51 +05:30
jitendra 7952e57e41 Cart page css updated 2019-09-05 17:39:10 +05:30
jitendra 75e294e1c5 Cart page quantity changer updated 2019-09-05 17:31:09 +05:30
jitendra 55fa22af6c Virtual product add to cart issue fixed 2019-09-05 15:36:28 +05:30
jitendra 38f73505af Assets compiled for production 2019-09-05 15:14:45 +05:30
jitendra 94290e6742 Option mission message added for configurable, group and bundle products during add cart 2019-09-04 17:33:55 +05:30
jitendra 55f888c1df Shop tranlation case fixed 2019-09-04 17:23:53 +05:30
jitendra 136c03ee3a Layered navigation price filter changed based on min_price and max_price 2019-09-04 16:52:38 +05:30
jitendra 3c5a2792e3 Removed configurable checks and deleted unwanted files 2019-09-04 16:23:05 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Sam 8c75c20e1d fixed issue #1371 2019-09-03 23:22:51 +05:30
jitendra eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
Karim Qaderi c088ee1f45
change route pages to page 2019-08-29 18:43:53 +04:30
Karim Qaderi 46a40cc421
add event page checkout/success 2019-08-25 21:36:06 +04:30
Lemme Velleõu 4f8f470095 added configurable order numbers 2019-08-22 18:24:30 +03:00
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 ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
Jitendra Singh fbf5da570e
Merge pull request #1318 from prashant-webkul/development
Development
2019-08-20 12:07:58 +05:30
Prashant Singh 8744c84eb9 product card hover padding removed 2019-08-20 10:48:17 +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
Jitendra Singh 39a195f923
Merge pull request #1296 from prashant-webkul/development
Development
2019-08-14 14:55:44 +05:30
rahul shukla 6609587387 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-08-14 12:03:52 +05:30
rahul shukla 909dbb51f0 condition changes for category filter 2019-08-14 12:02:30 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Hossein 578d0c7b94
Create Persian language file 2019-08-10 10:28:16 +04:30
Prashant Singh 06a4f1216b Dead code removal 2019-08-09 19:29:28 +05:30
Jitendra Singh a849ae9fc0
Merge pull request #1272 from prashant-webkul/development
Development
2019-08-09 19:12:44 +05:30
Prashant Singh bb12e07212 Cart rules refactored 2019-08-08 05:53:28 +05:30
Prashant Singh fbedc8a161 Added env's shop_mail_from param param in all mails related to customers and shop 2019-08-06 20:00:28 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
rahul shukla 763a380870 new customer notification, isssue #1247 2019-08-05 20:23:48 +05:30
Prashant Singh c751c16e6a Cart rule refactorization 2019-08-05 19:38:17 +05:30
rahul shukla 508bf188ce Issue #1239 2019-08-05 19:14:10 +05:30
Prashant Singh e4a5e84fb6 Refactoring cart rules 2019-08-03 19:54:02 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
rahul shukla 561803cd3c filterable attribute for category, tax price update on cart and issue #1234 2019-07-31 17:44:29 +05:30
rahul shukla 3a7e481d01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-30 20:09:55 +05:30
rahul shukla 39139f26ca Issues #1228 and #1229 2019-07-30 13:45:13 +05:30
Jitendra Singh 41510db280
Merge pull request #1202 from moe2566/master
Add text direction configuration for locales
2019-07-30 11:48:56 +05:30
rahul shukla dbff16b8b7 disabale zoom on mobile devices 2019-07-29 12:07:39 +05:30
rahul shukla 29763b902e issue of image at checkout #1209 2019-07-24 18:50:44 +05:30
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
rahul shukla cff63acfc8 reverting changes 2019-07-23 17:49:24 +05:30
rahul shukla 9cd9846d65 set locale on session if not available 2019-07-23 17:47:19 +05:30
rahul shukla f4eb973ba6 reduces number of loop for filter attribute #1192 2019-07-23 15:57:49 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
rahul shukla ef5eb1356c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-19 16:30:28 +05:30
rahul shukla 3200cbafc6 Issue #1190. 2019-07-19 16:30:01 +05:30
Arpad 4a941e461c Forget password notification Subject translation 2019-07-17 14:36:00 +02:00
Arpad 2c3467e611 Forgot password back link translation 2019-07-17 09:30:36 +02:00
rahul shukla 1ec288a182 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-15 17:04:10 +05:30
rahul shukla 67bb7704e7 merge with master 2019-07-15 17:03:54 +05:30
Alexey 5856d00e4b
Update search.blade.php
Use TOTAL instead of COUNT
2019-07-14 17:27:34 +04:00
Prashant Singh f8a4f1ba1c product card hover transition applied and reduced hover padding by 33% 2019-07-14 12:38:15 +05:30
Prashant Singh caf165d06c Fixed issue with image of product card getting cropped due to CSS 2019-07-14 12:25:57 +05:30
Prashant Singh 42d067c44a Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development 2019-07-14 07:30:16 +05:30
Prashant Singh 5f08f2b9f4 Fixed sort order for configuration in admin panel 2019-07-14 00:46:33 +05:30
rahul shukla 78d44a8be0 rtl css for slider 2019-07-11 19:53:18 +05:30
Prashant Singh 7ffbee95ad Shipping methods and payment methods description converted to translation string 2019-07-11 10:16:58 +05:30
rahul shukla cc4dfcad76 issue #1160, filterable attribute & configuration updated for validation 2019-07-09 14:47:40 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
rahul shukla 2f2f97a6d0 category check condition for sorting 2019-07-05 13:33:06 +05:30
rahul shukla f9863f440f category check condition for sorting 2019-07-05 13:24:46 +05:30
rahul shukla cfaee2f432 issue #1147 2019-07-04 13:56:18 +05:30
rahul shukla 9eb4b89344 json removed 2019-07-04 13:25:08 +05:30
rahul shukla 44a72db99e maximum price according to category 2019-07-04 13:20:21 +05:30
rahul shukla 60435b724f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-04 12:38:36 +05:30
rahul shukla c56d94f7a4 issue #968 and dependent field 2019-07-04 12:38:20 +05:30
jitendra f529a128cd Removed unnecessary code from sevice providers 2019-07-01 20:03:16 +05:30
jitendra b7d346260a Resolve conflicts 2019-07-01 17:12:44 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +05:30