merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,152 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

2278 Commits

Author SHA1 Message Date
Prashant Singh 140820dc4a Fixed issue #1334 2019-08-21 15:03: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
Prashant Singh 3c9ae5b35d Fixed issue with category or attribute field left empty 2019-08-21 12:19:53 +05:30
Prashant Singh ec89315b42 Fixed issue #1324 2019-08-21 11:16:01 +05:30
Prashant Singh 56a1fd4593 Fixed issue #1312 2019-08-21 10:17:16 +05:30
Prashant Singh f3b532adef WIP: CMS Pages fix in progress 2019-08-20 19:21:20 +05:30
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
Prashant Singh 3a9143462e Added asterisk in description fields of catalog rule update and create 2019-08-20 17:27:49 +05:30
Prashant Singh afafdfbfcd Fixed issue #1327 2019-08-20 16:48:11 +05:30
Prashant Singh 2a15488f24 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-08-20 16:47:00 +05:30
Prashant Singh 9d5793b7b5 Fixed issue #1326 2019-08-20 16:25:00 +05:30
Prashant Singh e52825a3f9 Fixed issue #1323 2019-08-20 16:10:24 +05:30
Prashant Singh 07be3c6a86 Fixed issue #1325 2019-08-20 16:07:41 +05:30
Prashant Singh 46e3badf4d Fixed issue #1275, #1321, #1285 2019-08-20 15:56:32 +05:30
Prashant Singh 01b9f5cbbc Fixed issue #1269 2019-08-20 13:33:24 +05:30
Prashant Singh 8cf6c41fc5 Fixed issue #1268 2019-08-20 13:31:59 +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
Prashant Singh 8744c84eb9 product card hover padding removed 2019-08-20 10:48:17 +05:30
Prashant Singh 9767e479f2 Webfont added 2019-08-19 23:36:52 +05:30
Prashant Singh 313c9b78ff Updated module to latest of the Bagisto 2019-08-19 17:34:29 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Jitendra Singh e5b904741c
Merge pull request #1316 from prashant-webkul/development 
Catalog rule implementation complete, new product price mechanish rem…
 2019-08-19 15:11:13 +05:30
Prashant Singh e97069d2be Catalog rule implementation complete, new product price mechanish remaining 2019-08-19 15:05:56 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Jitendra Singh b7bc6344bb
Merge pull request #1313 from prashant-webkul/development 
Development
 2019-08-19 13:56:04 +05:30
Jitendra Singh 2ce5d52709
Merge pull request #1282 from KarimQaderi/patch-2 
ViewRenderEventManager send string template
 2019-08-19 13:55:00 +05:30
Prashant Singh 8a9198e5d9 Catalog rules tie break in progress, squased a line of dead code in CartRuleController 2019-08-19 12:36:43 +05:30
Prashant Singh aca7b4c6c7 Catalog rule tie breaker content in progress 2019-08-17 20:18:39 +05:30
Prashant Singh 1d1018ac50 Refactoring of cart rules and syntax standard sugar 2019-08-17 17:40:17 +05:30
Jitendra Singh a8ff894d6c
Merge pull request #1310 from prashant-webkul/development 
Fixed channel locale issue in cms datagrid
 2019-08-17 15:49:18 +05:30
Prashant Singh bb972c6e48 CMS Bug fixes and updated readme 2019-08-17 15:42:24 +05:30
Prashant Singh eb2f805057 Correct name of channel column in CMS page datagrid 2019-08-16 19:18:00 +05:30
Prashant Singh b87e6cdb2e Fixed channel locale issue in cms datagrid 2019-08-16 18:48:13 +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
Prashant Singh 0019f7c673 Assets compiled for production 2019-08-16 12:02:45 +05:30
Prashant Singh e3d2be406e Updated stripe and saas modules to latest 2019-08-16 12:00:53 +05:30
Jitendra Singh f81d412546
Merge pull request #1298 from prashant-webkul/development 
Development
 2019-08-15 22:07:37 +05:30
Prashant Singh 8c96bca9b3 Base sync 2019-08-14 16:54:13 +05:30
Prashant Singh 44c33825e0 Cart discount helper namespace fix 2019-08-14 16:53:05 +05:30
Jitendra Singh 39a195f923
Merge pull request #1296 from prashant-webkul/development 
Development
 2019-08-14 14:55:44 +05:30
Prashant Singh de24f9a39c Fixed issue #1292 for CMS pages by making a separate view for helper classes and leaving future scope for things as well 2019-08-14 14:01:49 +05:30
Prashant Singh da5ad23c3b Fixed issue #1289 2019-08-14 13:50:32 +05:30
Prashant Singh c56a791069 Fixed issue #1295 2019-08-14 13:49:42 +05:30
Prashant Singh 54e54918a7 Fixed issue #1293 2019-08-14 13:44:21 +05:30
Prashant Singh 9425b39b78 Fixed issue #1294 2019-08-14 13:42:27 +05:30
rahul shukla 700c45df1a conflict resolve 2019-08-14 12:25:40 +05:30
rahul shukla 436d71bb44 merge with master 2019-08-14 12:06:00 +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 ce56fb3bb1 Added default attribute brand 2019-08-14 02:35:00 +05:30
Prashant Singh dd9ff1629d Fixed issue #1287 2019-08-13 23:31:14 +05:30
Jitendra Singh 6944128980
Merge pull request #1281 from KarimQaderi/patch-1 
fix Event get params
 2019-08-13 11:38:26 +05:30
Hossein d875855145
Update app.php 2019-08-13 10:33:30 +04:30
Karim Qaderi 781ed6e15e
change alignment of code 2019-08-13 10:08:07 +04:30
Karim Qaderi e329eb1c97
ViewRenderEventManager send string template 
send data view

Ex:
```
public function addDownloadble(ViewRenderEventManager $ViewRenderEventManager)
{
    $view_render = view('KarimQaderi_Dowloadble::hello')->with([
        'foo'=>'bar'
    ])->render();

    $ViewRenderEventManager->addTemplate($view_render);
}
```
 2019-08-12 20:01:46 +04:30
Karim Qaderi 3ba55c0f66
fix 2019-08-12 19:26:40 +04:30
Karim Qaderi 2e53bb520d
fix 2019-08-12 19:23:36 +04:30
Karim Qaderi 324289a4d0
fix Event get params 
https://github.com/bagisto/bagisto/issues/1280
 2019-08-12 19:20:03 +04:30
Prashant Singh 2a36c6bd0e Catalog rule implementation in progress 2019-08-12 19:23:33 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Hossein 90639a3d4a
Create Persian language file 2019-08-10 10:28:52 +04:30
Hossein 578d0c7b94
Create Persian language file 2019-08-10 10:28:16 +04:30
Hossein 33977ffd94
Create Persian language file 2019-08-10 10:27:40 +04:30
Hossein 1b86cd99f1
Create Persian language file 2019-08-10 10:24:54 +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 760e5240cb Stripe connect commissions issues fixed 2019-08-09 18:55:16 +05:30
Prashant Singh 8b78105ed9 Removed dead code 2019-08-09 18:52:01 +05:30
Prashant Singh 0f2a3c4f02 Fixed bug in customer group which was allowing admin to create groups with same code 2019-08-09 14:26:49 +05:30
Prashant Singh 352479912a Added unique constraint in customer group code column 2019-08-09 14:24:11 +05:30
Prashant Singh a72535db23 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-08-09 14:17:09 +05:30
Prashant Singh 3ca4b48ac3 Catalog rule update form in progress 2019-08-09 04:10:45 +05:30
Prashant Singh 55ead412ce Catalog rule create form implemented 2019-08-08 11:38:23 +05:30
Prashant Singh 6d41d37c3b Catalog rules migrations finalized 2019-08-08 07:28:08 +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 845f34038b Fixed bug in contains condition check 2019-08-06 16:24:35 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
Prashant Singh c661992a1a Non couponable rules refactoring 2019-08-06 14:06:25 +05:30
rahul shukla 063a58b753 Issue #1253 2019-08-05 21:00:39 +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 cff0b7f4b2 refactroring of vart rules 2019-08-05 05:06:51 +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
Prashant Singh 38e4bb331c Fixed stripe connect 2019-08-01 11:02:03 +05:30
Prashant Singh 575a126567 Stripe connect revoke access bug fixed 2019-08-01 10:59:18 +05:30
rahul shukla 9ba2357d7c reverting changes, delete for product_attribute in product flat 2019-08-01 10:22:23 +05:30
rahul shukla 6f64de0f26 issue #1235 2019-07-31 19:19:26 +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 270bdfa553 delete in product flat 2019-07-30 20:09:40 +05:30
Prashant Singh 0aa1a4bee9 Fixed migration 2019-07-30 19:23:30 +05:30
Prashant Singh 880827f6f4 Customer document migration fix 2019-07-30 19:16:00 +05:30
Prashant Singh 9b0c3456e5 Modules preorder, customer document and group catalog updated 2019-07-30 16:22:27 +05:30
Prashant Singh d8086091cb Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-30 13:54:25 +05:30
Prashant Singh a5def0aa13 Updated Stripe Connexct 2019-07-30 13:53:50 +05:30
rahul shukla 39139f26ca Issues #1228 and #1229 2019-07-30 13:45:13 +05:30
Jitendra Singh 9a211adaa4
Merge pull request #1207 from ArmCM/refactor/code_style 
WIP - fix code style laravel
 2019-07-30 11:49:27 +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 c73e12a052 try, catch for password reset. issue #1177 2019-07-30 10:50:05 +05:30
rahul shukla 1b95d3d877 product creation on channel based and admin logo 2019-07-30 10:36:26 +05:30
rahul shukla b39f412842 issue #1217, #1220 and #1218 2019-07-29 14:44:38 +05:30
rahul shukla d83396d437 issue #1217, #1220 and #1218 2019-07-29 14:38:17 +05:30
rahul shukla 2e336c935a test field added for depandenet field in configuaration 2019-07-29 14:34:54 +05:30
rahul shukla 9d9b0b5176 use in product flat column added in attributes 2019-07-29 14:33:33 +05:30
rahul shukla dbff16b8b7 disabale zoom on mobile devices 2019-07-29 12:07:39 +05:30
Prashant Singh f9e91bb0ef Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-25 11:26:34 +05:30
rahul shukla fca1d6d15c filter code updated 2019-07-25 11:11:18 +05:30
moe2566 09cfa77378
Update anonymous-master.blade.php 2019-07-24 10:19:50 -04:00
Prashant Singh 1a3038ae72 New cart rule actions 2019-07-24 19:32:37 +05:30
rahul shukla 13a982f480 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-24 18:51:03 +05:30
rahul shukla 29763b902e issue of image at checkout #1209 2019-07-24 18:50:44 +05:30
rahul shukla 1dd5faa21d change Datatype for code 2019-07-24 17:55:32 +05:30
ArmCM ae6c6fa193 WIP - fix code style laravel 2019-07-24 02:50:22 -05:00
Jitendra Singh 871bc8c190
Merge pull request #1205 from rahulshukla-webkul/development 
assests compile for production
 2019-07-24 12:39:48 +05:30
rahul shukla 97320b52ea assests compile for production 2019-07-24 10:40:51 +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
Hans Schouten cfb4b8d682
Fix firing the wrong event after storing user 2019-07-23 21:59:28 +02:00
Prashant Singh 45ce843772 Cart rule new actions implementation 2019-07-23 18:23:49 +05:30
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 2acad0e540 Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage 2019-07-23 13:43:37 +05:30
Prashant Singh dfd6ea8c25 Translations fixes in promotions sections 2019-07-23 13:07:22 +05:30
rahul shukla bcd84d9e7f corrction in route 2019-07-23 12:04:09 +05:30
Prashant Singh 70267e29cb disabled catalog rule 2019-07-22 13:01:54 +05:30
Prashant Singh 0bd422db97 translation fixes in cart rule forms 2019-07-22 13:01:07 +05:30
Prashant Singh 9cf1ea2516 disabled catalog rule till final migrations 2019-07-22 12:54:46 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
Prashant Singh 27ca4cb622 Minor fixes 2019-07-22 12:50:06 +05:30
Prashant Singh 38e029463e transition of cart rule from old method is now complete, now need to verify actions 2019-07-22 12:44:40 +05:30
Prashant Singh f8da943cea Removed a bug when attribute conditions applied with cart rule were not allowing the rule to get applied 2019-07-22 12:35:36 +05:30
Prashant Singh 7f3ed81554 Removed a bug from convertXToProductId from cart rule edit form causing it to exception when no criteria for products to be applied is done emtpy after having a previous criteria 2019-07-22 12:18:59 +05:30
Prashant Singh 38c5a115db Updated actions for cart rules with couple of new actions 2019-07-19 19:26:33 +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
Prashant Singh 85865ba939 Eliminated discount configuration 2019-07-19 15:47:01 +05:30
Prashant Singh bcdec8ec5a Removed old migrations of catalog rule and removed a bug in convertXToProductId 2019-07-19 15:44:15 +05:30
Prashant Singh a9994a3143 Translation issue fixes for cart rule create and edit forms 2019-07-19 10:49:19 +05:30
Prashant Singh f68428ca4d Fixed a bug in convertXToProductId when attribute result was empty it was throwing exception 2019-07-19 10:20:39 +05:30
Prashant Singh 48d068d760 ConvertXToProductID bug fix when left null 2019-07-18 18:20:21 +05:30
Prashant Singh 750842b2a9 ConvertXToProductId implemented now removal duplicated productIds left 2019-07-18 17:38:09 +05:30
Prashant Singh 4ba8498a1e updated migration 2019-07-18 17:18:06 +05:30
Prashant Singh 02155d9d6d Fixed the issue with customer groups 2019-07-18 17:13:48 +05:30
Prashant Singh b512666ef1 ConvertXToProductId from attributes implemented 2019-07-18 14:08:36 +05:30
rahul shukla 383e782d3c route correction for customer after login 2019-07-18 13:10:10 +05:30
rahul shukla f61554c5a6 configuration changes for dependent field 2019-07-18 12:51:22 +05:30
Prashant Singh 247b662b7e Position fixes for buttons used in tabbed forms 2019-07-18 10:45:59 +05:30
Prashant Singh 52e3a64380 Made all submit buttons of create and update buttons style to fixed 2019-07-18 10:10:49 +05:30
Prashant Singh 2a9b4220d6 Only finding product ids is left then apply them on cart rules 2019-07-17 18:54:43 +05:30
Arpad 4a941e461c Forget password notification Subject translation 2019-07-17 14:36:00 +02:00
Prashant Singh 3d53a221ef Has options check applied on frontend for options related to select and multiselect attributes 2019-07-17 16:18:10 +05:30
Prashant Singh 4017e3b16e ConvertXToProductId frontend complete now moving to converting X to ids 2019-07-17 16:14:04 +05:30
Arpad 2c3467e611 Forgot password back link translation 2019-07-17 09:30:36 +02:00
Prashant Singh 08f606c099 Worked on ConvertXToProductId and the bug in multiselect caused a huge delay but right now we have falled back to old select box 2019-07-16 19:02:40 +05:30
Prashant Singh 6ba5e0df0a Added back catalog rule migration, a bug is stuck in convert x to productid migrations 2019-07-15 19:54:38 +05:30
Prashant Singh 93a035b147 Fixer io disabled temporarily 2019-07-15 18:25:14 +05:30
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
rahul shukla 27d6e8894c checkbox type attribute 2019-07-15 18:00:56 +05:30
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
Prashant Singh 7952253e18 Applied a fix for a bug related to shipping modules creating problem when being used with cart rules 2019-07-15 16:04:25 +05:30
Prashant Singh 9f9e0b6a68 Created a command to activate the usage of catalog rule 2019-07-15 16:02:39 +05:30
Prashant Singh 2a6e43de28 Part of convertxtoid frontend complete in cart rule create form, fixed sort order for catalog in admin panel 2019-07-15 14:11:00 +05:30
Prashant Singh 0b29f29022 Added property in customers model to check if the email exists or not 2019-07-15 12:46:33 +05:30
Alexey 5856d00e4b
Update search.blade.php 
Use TOTAL instead of COUNT
 2019-07-14 17:27:34 +04:00
Prashant Singh 0d0a588c33 added products subselection in cart rules create page(in progress 50% done) 2019-07-14 17:20:09 +05:30
Prashant Singh d860466dfc mass action index now totally dependent on datagrid's index property 2019-07-14 14:30:44 +05:30
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
Prashant Singh f8c774b3a5 Started with convert x to product id for cart rules 2019-07-13 15:23:27 +05:30
rahul shukla 78d44a8be0 rtl css for slider 2019-07-11 19:53:18 +05:30
rahul shukla 20a205deba locale id in cstegory trnaslation 2019-07-11 19:45:48 +05:30
jitendra 3d527d6aba Updated 2019-07-11 15:05:07 +05:30
Prashant Singh 7ffbee95ad Shipping methods and payment methods description converted to translation string 2019-07-11 10:16:58 +05:30
Prashant Singh 88611c9d84 Fixed issue #1172 2019-07-11 09:49:32 +05:30
Prashant Singh abd3913d45 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-10 10:37:29 +05:30
Prashant Singh 457a26176d fixed issues and uploaded logo of client 2019-07-09 15:54:00 +05:30
Prashant Singh 5a8679b170 SAASPreorder blade files publish enabled for product card 2019-07-09 15:25:38 +05:30
rahul shukla cc4dfcad76 issue #1160, filterable attribute & configuration updated for validation 2019-07-09 14:47:40 +05:30
Prashant Singh 6afef120b9 Show price after login translation fixed 2019-07-09 13:14:42 +05:30
Prashant Singh 68bba4d7e2 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-09 12:54:42 +05:30
Prashant Singh 316ec39aaf Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title 2019-07-09 11:18:02 +05:30
Prashant Singh 869265e7a5 Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields 2019-07-09 10:11:19 +05:30
Prashant Singh e41ac8c144 Added excluded sites configuration to exclude subdomains from company registration 2019-07-08 17:20:28 +05:30
Prashant Singh 458fd9166f Fixed exception handling in SAASCustomizer 2019-07-08 17:15:27 +05:30
rahul shukla f9e9dfbae1 slider delete issue 2019-07-08 17:10:42 +05:30
rahul shukla 6fec08f814 check updated, issue #1162 2019-07-08 15:45:15 +05:30
rahul shukla 3511c08e46 issue #1062 2019-07-08 15:38:05 +05:30
rahul shukla 79d25c7d2e issue #1060 2019-07-08 15:09:42 +05:30
Prashant Singh 223bef7c72 Removed stripe connect dependencies from SAASCustomizer package 2019-07-08 13:29:07 +05:30
rahul shukla 746a17dcf6 conflict resolve 2019-07-08 13:13:34 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
Jitendra Singh 2c45ddee13
Merge pull request #1157 from danielpinon/patch-1 
Updating translations of languages ​​in pt_BR
 2019-07-08 12:13:54 +05:30
Daniel Pinon 723f6ad639
Clearing duplicity 2019-07-06 23:59:59 -03:00
Daniel Pinon c5fe78014c
Updating translations of languages ​​in pt_BR 2019-07-06 23:58:01 -03:00
Prashant Singh 8c19d9e0ce removed dead code 2019-07-06 17:47:45 +05:30
Prashant Singh c8e8df1699 Added configuration for cart rules 2019-07-06 17:41:58 +05:30
rahul shukla 54481ebbfe slider edit issue 2019-07-05 18:15:22 +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
Prashant Singh 3fe220428c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-05 13:23:56 +05:30
jitendra 1592c9e37f Fixed downloadable issues with locale change 2019-07-05 11:52:14 +05:30
jitendra 1fd25cfc92 Added currency symbol in currencies table 2019-07-05 11:46:45 +05:30
Prashant Singh e33a374e67 Shop package views reste 2019-07-05 11:18:11 +05:30
Prashant Singh bb182972f8 Fixed issue #83 2019-07-04 18:20:49 +05:30
Prashant Singh 6cb1f0f699 Fixed a bug in SAAS module core 2019-07-04 16:01:04 +05:30
Prashant Singh 65df13c545 Fixed a bug related to rul parameter 2019-07-04 15:57:13 +05:30
Prashant Singh c3622fa53b Fixed bug related to preorder 2019-07-04 14:29:49 +05:30
rahul shukla cfaee2f432 issue #1147 2019-07-04 13:56:18 +05:30
Prashant Singh f5059364c2 Changes made to stripe connect, all the dependencies hard coded for connect in SAAS module had been successfully migrated 2019-07-04 13:42:05 +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
Prashant Singh fdd3ff8779 Fixed issue with stripe 2019-07-03 18:51:35 +05:30
Prashant Singh b868887ccc Fixed preorder bug 2019-07-03 18:16:07 +05:30
Prashant Singh 80ea917581 Shop package view reset 2019-07-03 15:24:25 +05:30
jitendra a514ad5c02 Added jwt service provider to app.php 2019-07-03 15:16:06 +05:30
Prashant Singh 7053a425c2 Fixed issue #76 2019-07-03 15:12:29 +05:30
Prashant Singh 3d552b79fe A small bug fix in shop price after login 2019-07-03 14:01:24 +05:30
Prashant Singh 5b3bde0d3a Fixed issue with customer document #74 2019-07-03 13:35:27 +05:30
Prashant Singh f8d38e9bbd Enabled usage parameters of cart rule in create and edit form 2019-07-03 11:37:09 +05:30
Prashant Singh dfc0941fe4 Added the purge pool configuration file in the saas module 2019-07-03 10:56:04 +05:30
Prashant Singh 42c2f07dbc Actual resource tree formed 2019-07-03 10:21:05 +05:30
Prashant Singh 71f0556e9f Updated the frontend files for show price after login and publish path changed to a general folder resources 2019-07-02 18:39:07 +05:30
jitendra 31b6e779d6 Fixed image wrapper css issue 2019-07-02 17:55:56 +05:30
jitendra f3d3dcd733 Now product types can have additional form validations 2019-07-02 16:59:47 +05:30
jitendra 1fb5d9b1fc Removed unnecessary classed from product types 2019-07-02 14:44:07 +05:30
Prashant Singh 2ce18e5a49 Placing the conflicted files of show price after login and preorder to the actual paths instead of altering the original shop package view files 2019-07-02 14:23:21 +05:30
Prashant Singh 46d1ec1fc9 Over ride of summary.blade.php according to stripe connect done 2019-07-02 14:15:32 +05:30
Prashant Singh 9276a695b6 Some fixes in stripe 2019-07-02 14:09:26 +05:30
Prashant Singh 9042757f4f Updated the get root categories method inside category repository class 2019-07-02 13:04:14 +05:30
Prashant Singh 12c321e80e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-02 12:45:59 +05:30
Prashant Singh bfe52a7d3c Enabling coupon usage option for cart rules and start of the program convertxtoproductid 2019-07-02 12:45:30 +05:30
jitendra f529a128cd Removed unnecessary code from sevice providers 2019-07-01 20:03:16 +05:30
jitendra 318857b785 Now images will be deleted too if the model gets deleted 2019-07-01 19:42:12 +05:30
prateek srivastava 0e0cd7237a change in Get root category 2019-07-01 18:07:43 +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
Prashant Singh 350ffb1fa9 Fixes in preorder 2019-06-29 20:41:15 +05:30
Prashant Singh 07e90ae0f4 git add . 2019-06-29 20:40:28 +05:30
Prashant Singh 1c1dc3c834 fixed issue with preorder button not coming on storefront 2019-06-29 19:34:04 +05:30
Prashant Singh 170377509c Fixed search issue in preorder datagrid 2019-06-29 19:21:18 +05:30
Prashant Singh 3d352b690a Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-29 18:49:08 +05:30
Jitendra Singh e9608d87ef
Merge pull request #1143 from prashant-webkul/development 
Development
 2019-06-29 18:49:00 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +05:30
Prashant Singh be2b55a898 fixed event fire on movetocart from wishlist 2019-06-29 18:44:23 +05:30
Prashant Singh e7e9c24451 Preorder path fixes after updation 2019-06-29 18:35:27 +05:30
Prashant Singh da29f58531 Publishing for frontend files stopped for preorder and show price after login 2019-06-29 18:20:49 +05:30
Prashant Singh 1057cd654e Updated preorder in SAAS 2019-06-29 18:19:39 +05:30
Jitendra Singh 337c45426f
Merge pull request #1142 from rahulshukla-webkul/development 
style for dashboard
 2019-06-29 18:16:39 +05:30
Prashant Singh 1b43e9c253 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-29 18:14:42 +05:30
rahul shukla 2f905203a2 style for dashboard 2019-06-29 18:12:07 +05:30
jitendra f08a8036e6 Resolved conflict 2019-06-29 17:57:10 +05:30
jitendra 3ef416b22e Added downloadable order item info 2019-06-29 17:51:49 +05:30
Jitendra Singh 842a0f77d4
Merge pull request #1141 from prashant-webkul/development 
Added cart item add before event
 2019-06-29 17:50:14 +05:30
Prashant Singh e3bc993c99 Added cart item add before event 2019-06-29 17:24:41 +05:30
Prashant Singh 8155637f39 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-29 17:10:05 +05:30
Jitendra Singh 44af368b9c
Merge pull request #1139 from rahulshukla-webkul/development 
css changes for overflow
 2019-06-29 17:09:32 +05:30
Jitendra Singh 77af67ffd1
Merge pull request #1140 from prashant-webkul/development 
Development
 2019-06-29 17:09:19 +05:30
Prashant Singh ec2baa1be9 bug fix for event fire 2019-06-29 17:07:19 +05:30
Prashant Singh ff863fcc54 Added cart item add after event for move to cart from wishlist 2019-06-29 17:04:18 +05:30
Prashant Singh 3d02016db4 Customer document icon applied 2019-06-29 16:27:07 +05:30
Prashant Singh 4e8b5d875c Updated credit max 2019-06-29 16:02:03 +05:30
Prashant Singh 15690a1f0d Company id check removed from admins 2019-06-29 15:56:13 +05:30
Prashant Singh 8ef75d2be7 Fixed bug with admins user was coming in check with current company 2019-06-29 15:54:35 +05:30
Prashant Singh 67c3eeb25e customer document bug fix 2019-06-29 15:46:10 +05:30
Prashant Singh 76742eff85 Customer documents bug fix 2019-06-29 15:41:57 +05:30
rahul shukla b8c0f4aed6 css changes for overflow 2019-06-29 15:26:26 +05:30
jitendra ad6e422fdb Added downloadable and virtual products 2019-06-29 15:23:34 +05:30
Prashant Singh 6c003f949f Company check implemented in customer document module 2019-06-29 15:21:53 +05:30
Prashant Singh d164178609 Fixed a stripe transaction fee view bug in shop bundle 2019-06-29 14:52:15 +05:30
Prashant Singh 82db366587 Updated bulk add to cart and customer document 2019-06-29 14:46:42 +05:30
Prashant Singh 930788212d Added preorder in acl 2019-06-29 12:53:28 +05:30
Prashant Singh f010b80cc2 Added StripeConnect and Customer Document in acl configuration 2019-06-29 12:50:57 +05:30
Prashant Singh 37409709ce Fixed dashboard arrow icon issue 2019-06-29 12:14:50 +05:30
Prashant Singh edc53c90f9 Fixed channel root category issue 2019-06-29 12:11:35 +05:30
Prashant Singh f526eb9337 Added the stripe transaction amount in cart before transacting using stripe and reducing it if payment fails. 2019-06-29 11:46:49 +05:30
Prashant Singh 04462c7212 Customer document updated 2019-06-29 11:40:58 +05:30
Prashant Singh d891fb108c Stripe Icon Added 2019-06-29 11:34:11 +05:30
Prashant Singh 51f0eec908 Added column in preorder datagrid and corrected the spelling in customer document 2019-06-29 11:05:58 +05:30
jitendra 55b71e1e66 updated 2019-06-28 19:48:52 +05:30
Prashant Singh c217598843 Ignored customer documents table from DBManager 2019-06-28 18:28:49 +05:30
Prashant Singh f6f06d7a40 Updated credit max module 2019-06-28 17:22:17 +05:30
rahul shukla e6c20fa11e table in email template 2019-06-28 17:20:47 +05:30
Prashant Singh b00374fa81 Updated preorder package for customization 2019-06-28 17:20:19 +05:30
rahul shukla 34fd4e3840 assets compile for production 2019-06-28 17:11:26 +05:30
rahul shukla 8e9768f947 assets compile for production 2019-06-28 17:08:30 +05:30
rahul shukla d5b66ebf9e table in email template 2019-06-28 17:05:08 +05:30
Prashant Singh baf104509b Updated the customer document module 2019-06-28 17:01:00 +05:30
Prashant Singh 794aac2c8e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-28 16:57:17 +05:30
Prashant Singh ba8fb649e7 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-28 16:33:08 +05:30
rahul shukla beabada35e acl added for cart rule & dashboard css changes 2019-06-28 16:30:36 +05:30
Prashant Singh 8a5d57bcc6 new compiled assets for production 2019-06-28 16:30:36 +05:30
Prashant Singh fce7ec8586 Assets compiled for production and updated the changelog for new release v0.1.6 2019-06-28 16:29:41 +05:30
rahul shukla 0088bf7709 check in phone column unique removal 2019-06-28 15:44:17 +05:30
rahul shukla 7c8dc15c58 check in phone column unique removal 2019-06-28 15:43:53 +05:30
rahul shukla fdb9252b2a check for phone column & verrion last digit check in installer 2019-06-28 15:18:48 +05:30
Prashant Singh c4ec5853e2 Fixed conditions issue 2019-06-28 15:13:57 +05:30
Prashant Singh 5174c02bb0 Problem with does not contains condition is not fixed 2019-06-28 14:49:37 +05:30
Prashant Singh 35b8af8d47 Non argument fix for reset shipping 2019-06-28 13:29:39 +05:30
Prashant Singh a304795c36 Fixed issues with buy atleast 2019-06-28 12:59:40 +05:30
Prashant Singh e8dd4219a7 Apply on shipping working on cart rule 2019-06-28 12:57:19 +05:30
Prashant Singh 02faaf7415 Added reset shipping when applying coupon cart rule 2019-06-28 11:30:01 +05:30
Prashant Singh e4612d8629 Fixed some discrepancies in apply to shipping in cart rules 2019-06-28 10:56:44 +05:30
Prashant Singh 4339475e70 CheckOnShipping method added to check where rule applies on shipping or not 2019-06-27 19:55:36 +05:30
Prashant Singh 25007824eb Shipping now getting applied according to selected shipping method 2019-06-27 19:51:17 +05:30
Prashant Singh 4db41973fd Removed the option of BuyAGetB as its current functionality was same as Fixed amount 2019-06-27 18:34:37 +05:30
Prashant Singh 216b409531 Apply to shipping and free shipping now added in normal flow 2019-06-27 17:09:56 +05:30
Prashant Singh ec0277d3fb Some improvements in super admin panels for SAASModule 2019-06-27 16:58:57 +05:30
Prashant Singh e17da6fdfa Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 16:41:46 +05:30
Prashant Singh 5135ef5f34 Optimized validates discount class as it was creating redundancy with discount class 2019-06-27 16:40:57 +05:30
Jitendra Singh 5bf6f30f4a
Merge pull request #1125 from prashant-webkul/development 
Fixed issue with cart rule validation when placing order
 2019-06-27 16:28:36 +05:30
Prashant Singh db12a1587f Fixed issue with cart rule validation when placing order 2019-06-27 16:27:06 +05:30
Prashant Singh af100ac04e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-27 16:20:29 +05:30
Jitendra Singh 4feeffaf51
Merge pull request #1124 from prashant-webkul/development 
Fixed issue #1080
 2019-06-27 16:18:13 +05:30
Prashant Singh 9b83fb8025 Fixed issue #1080 2019-06-27 16:14:24 +05:30
Prashant Singh 3e86f81681 Base sync with core master 2019-06-27 15:05:13 +05:30
Jitendra Singh 9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development 
Product export now added
 2019-06-27 14:59:42 +05:30
Prashant Singh 487484f86d Product export now added 2019-06-27 14:55:32 +05:30
Jitendra Singh 4627c6a519
Merge pull request #1122 from prashant-webkul/development 
Development
 2019-06-27 14:43:51 +05:30
Prashant Singh c245eab856 Fixed issue #1086 for customer edit 2019-06-27 14:41:01 +05:30
rahul shukla 79b5e1c4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 14:38:48 +05:30
rahul shukla a9090e991c download for image & file type 2019-06-27 14:38:24 +05:30
Prashant Singh d1395ba145 Fixed issue #1086 2019-06-27 14:24:26 +05:30
Prashant Singh 3f79f2b89a Fixed issue #1114, #1112 2019-06-27 13:30:45 +05:30
Prashant Singh bebf5e105b Base sync with github master 2019-06-27 13:11:48 +05:30
Jitendra Singh fd06d6dc26
Merge pull request #1117 from jitendra-webkul/jitendra 
Removed propaganistas/laravel-intl dependency
 2019-06-27 13:03:12 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Jitendra Singh 367f1771a8
Merge pull request #1116 from prashant-webkul/development 
Added remove logic in coupon rule class
 2019-06-27 13:00:04 +05:30
Prashant Singh 5073226872 Added remove logic in coupon rule class 2019-06-27 12:58:41 +05:30
Jitendra Singh e45fee03c6
Merge pull request #1115 from prashant-webkul/development 
Cart rule guest issues and discount price not visible in cart summary…
 2019-06-27 12:58:07 +05:30
Prashant Singh 64a6f06357 Cart rule guest issues and discount price not visible in cart summary is now fixed 2019-06-27 12:56:31 +05:30
Jitendra Singh 0102dd0c30
Merge pull request #1111 from prashant-webkul/development 
Development
 2019-06-27 11:45:23 +05:30
Prashant Singh 790bc2d7a4 Added the extra note on summary for stripe fees when customer is selected to pay stripe fees as transaction fees 2019-06-27 05:05:56 +05:30
Prashant Singh 9ba162e7a0 Critical bug fix in super admin security 2019-06-27 04:43:45 +05:30
Prashant Singh c539e017fe Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-27 04:38:41 +05:30
Prashant Singh 3e4d2603c4 Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount 2019-06-27 04:35:26 +05:30
Prashant Singh 8a37088b9f Omitted the applicable rules that gives 0 value discounts 2019-06-27 02:25:44 +05:30
Prashant Singh 7e8ae8022b Some conditions changed according to end_other_rules attribute 2019-06-27 02:18:47 +05:30
Prashant Singh 72cf1c0226 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 01:36:18 +05:30
Prashant Singh 6d40b54d1d Remote sync 2019-06-27 01:36:11 +05:30
Prashant Singh c783ffa966 Added more checks for noncouponable and couponable rule interfaces 2019-06-27 01:32:32 +05:30
rahul shukla 54fa3419f3 admin name for attribute 2019-06-26 21:03:52 +05:30
rahul shukla 62cb90e014 status for customer 2019-06-26 18:02:14 +05:30
Prashant Singh 73d9966a12 Fixed issue #1108 2019-06-26 16:42:53 +05:30
rahul shukla 9a92a61724 try & catch added in buynow 2019-06-26 16:40:15 +05:30
Prashant Singh 1573ae5261 Added product export feature, to be migrated in core framework 2019-06-26 14:39:24 +05:30
Prashant Singh 397d83e64f Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-26 14:36:54 +05:30
Jitendra Singh fe14287b07
Merge pull request #1106 from prashant-webkul/development 
Development
 2019-06-26 14:33:29 +05:30
Prashant Singh 00ba0f2e71 Fixed issue with guest checkout when looking for cart rules based on guest customer groups 2019-06-26 14:30:32 +05:30
Prashant Singh 00bb4b0367 Preorder bug fixes 2019-06-25 17:08:52 +05:30
Prashant Singh 85ed096185 Fixes in customer document, removal of session from company facade 2019-06-25 16:56:57 +05:30
Prashant Singh 02be744066 Removed is_guest check from couponable and non couponable rules 2019-06-25 15:36:41 +05:30
Prashant Singh ead9f2d465 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-25 15:04:41 +05:30
Jitendra Singh a60e339218
Merge pull request #1105 from prashant-webkul/development 
Development
 2019-06-25 15:02:46 +05:30
Prashant Singh af04acf76e Fixes in preorder 2019-06-25 15:00:34 +05:30
Prashant Singh ddb2f1b59f Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-06-25 14:57:57 +05:30
Prashant Singh ecd766cb81 Some changes in frontend regarding coupon form on checkout 2019-06-25 14:57:26 +05:30
Prashant Singh 68c22f38f6 improvements in cart rules 2019-06-25 14:44:14 +05:30
Jyoti Singh 44947074a4 added discount threshold check in fixed amount cart rule 2019-06-25 13:37:24 +05:30
Prashant Singh 35a87aa7fd Added more security fixes for cart rules 2019-06-25 13:19:58 +05:30
Prashant Singh 463ff5a8ac Fixed issues with cart rules and made a validation function that checks the applied rule for any changes made in cart 2019-06-25 13:14:12 +05:30
Prashant Singh 1a262e0f27 Fixed some bugs in cart rules 2019-06-25 12:27:13 +05:30
Prashant Singh eedc0c6153 eliminated the column is_guest column from cart rules in favor of guest as a customer group 2019-06-25 11:10:21 +05:30
Prashant Singh 3382ffc076 Customer group catalog fixed 2019-06-24 19:23:20 +05:30
Prashant Singh 35c8402749 Store front files published according to new customer group categoru 2019-06-24 18:52:45 +05:30
Prashant Singh cc649c83da Fixed customer group category 2019-06-24 18:47:29 +05:30
Prashant Singh a7d1c5e518 PreOrder fixes 2019-06-24 18:25:47 +05:30
rahul shukla b0efd192e2 removed undefined variable rule from checkout/save payment 2019-06-24 18:03:31 +05:30
Prashant Singh 7fd8122251 Fixed issue with preorder 2019-06-24 17:10:33 +05:30
Prashant Singh f825be085a Customer document fixed 2019-06-24 17:06:14 +05:30
Prashant Singh e79701b037 customer group catalog fixed 2019-06-24 16:06:46 +05:30
Prashant Singh e130e79121 Fixed issue with preorder not showing button 2019-06-24 12:09:47 +05:30
Prashant Singh 714d9deed1 updated package of customer group catalog 2019-06-24 11:22:06 +05:30
Prashant Singh df2e63a12a Removed exception when seller ain't supporting stripe and added statement descriptor and who will pay service fees 2019-06-22 18:29:52 +05:30
Prashant Singh bddb039ce6 Fixed a bug related to product review write in showprice after login 2019-06-22 17:06:16 +05:30
Prashant Singh 791dd64800 Preorder and show price after login integrated in shop views 2019-06-22 16:57:36 +05:30
Prashant Singh 7d023afa5b conditions now more properly grouped for show price after login functionalities 2019-06-22 16:52:46 +05:30
Prashant Singh 14546dc12d Show price after login permanently integrated into the system 2019-06-22 16:40:12 +05:30
Prashant Singh 3aa0135aec changed shop blade files according to show price after login 2019-06-22 16:27:56 +05:30
Prashant Singh e327ee2b05 reverted shop packages views 2019-06-22 15:18:10 +05:30
Prashant Singh b11f5fe46f Refactoring show price after login blade files 2019-06-22 15:01:20 +05:30
Prashant Singh bce5997b11 Reverted blade files to original 2019-06-22 14:53:30 +05:30
Prashant Singh c3bfcf5d79 Show price after login modified 2019-06-22 13:53:36 +05:30
Prashant Singh 1d988dd82a Show price after login refactor 2019-06-22 13:18:22 +05:30
Prashant Singh 813bccf758 Totally fixed registration form 2019-06-22 13:04:13 +05:30
Prashant Singh 75f45b765c More stripe settings added for seller 2019-06-22 12:30:50 +05:30
Prashant Singh 07858f5ef7 Registration form fixed 2019-06-22 12:03:54 +05:30
Prashant Singh cf0f54cc7a Registration form fixed with unique validations 2019-06-22 11:57:56 +05:30