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

1040 Commits

Author SHA1 Message Date
jitendra 1afd2f9da3 Is default flag added to bundle product edit form 2019-09-05 11:19:33 +05:30
Hossein f20dea46e4
Fix #1392 2019-09-05 09:33:08 +04: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
Prashant Singh ce79814408 Minor fix 2019-09-03 16:38:50 +05:30
jitendra eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
Prashant Singh f8cbdd488c Fixed issue #1366 2019-09-02 23:00:39 +05:30
Prashant Singh 108795778b Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-02 19:53:25 +05:30
Prashant Singh 62d1b23a14 New issue template for filing issue and cut the issue filing hassle 2019-08-31 14:37:40 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
Prashant Singh 1e0da3c42a Fixed issue #778 2019-08-29 16:11:12 +05:30
Prashant Singh 6709594889 Added a new type of field for color picker in configuration 2019-08-27 13:07:48 +05:30
Prashant Singh 0e048f6dcb Added the cms pages create and edit form in two separate accordian one for design and one for seo 2019-08-27 10:27:46 +05:30
Prashant Singh ca30234e0a Merge branch 'master' of https://github.com/bagisto/bagisto 2019-08-24 16:09:59 +05:30
Prashant Singh 8994cd0426 Base sync and webfont fixes 2019-08-24 16:09:22 +05:30
Jitendra Singh f5e8766c89
Merge pull request #1352 from prashant-webkul/development 
Added entry for CMS in core's concord.php
 2019-08-24 16:01:51 +05:30
Prashant Singh a18bf91728 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-08-24 15:59: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 49c2f1c9d8 Slider content work complete 2019-08-23 18:01:44 +05:30
Jitendra Singh 6169d7cc8d
Merge pull request #1346 from prateek-webkul/master 
#1338 issue fixed
 2019-08-23 13:38:45 +05:30
Jitendra Singh 9b625dbb9f
Merge pull request #1345 from prashant-webkul/development 
Development
 2019-08-23 13:34:43 +05:30
Prashant Singh 5bc496d823 Changed column grand_total to base_grand_total in Order invoices datagrid 2019-08-23 13:32:20 +05:30
Prashant Singh 0c79d87503 Removed stripe fees visibility from every where 2019-08-23 13:15:10 +05:30
prateek srivastava 3e8d8bc7ab #1338 issue fixed 2019-08-23 12:13:18 +05:30
Prashant Singh a7d7bc80fa Added some blade render events in settings 2019-08-23 10:38:59 +05:30
Prashant Singh a30b16e9a0 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-08-23 08:59:19 +05:30
Lemme Velleõu 4f8f470095 added configurable order numbers 2019-08-22 18:24:30 +03:00
prateek srivastava b0c8eb5eb5 issue of layout fixed in admin tax 2019-08-22 19:34:08 +05:30
prateek srivastava 5f34825678 issue of admin panel form button fixed 2019-08-22 19:28:41 +05:30
rahul shukla 486c6ca63f issue #1340 2019-08-22 13:56:21 +05:30
jitendra 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +05:30
Prashant Singh 151c7a830a Fixed issues related to empty attribute conditions 2019-08-21 16:10:39 +05:30
Prashant Singh 171b48453e Made cart rule conditions interpreter fault tolerant to missing attributes 2019-08-21 15:22:37 +05:30
Prashant Singh 3b61c17155 Fixed issue #1333 2019-08-21 15:07:14 +05:30
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
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
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
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 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
Prashant Singh dd9ff1629d Fixed issue #1287 2019-08-13 23:31:14 +05:30
Hossein d875855145
Update app.php 2019-08-13 10:33:30 +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 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 8b78105ed9 Removed dead code 2019-08-09 18:52:01 +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 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 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 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
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 d8086091cb Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-30 13:54:25 +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 1b95d3d877 product creation on channel based and admin logo 2019-07-30 10:36:26 +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
moe2566 09cfa77378
Update anonymous-master.blade.php 2019-07-24 10:19:50 -04:00
rahul shukla 1dd5faa21d change Datatype for code 2019-07-24 17:55:32 +05:30
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
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
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 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
rahul shukla 3200cbafc6 Issue #1190. 2019-07-19 16:30: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 48d068d760 ConvertXToProductID bug fix when left null 2019-07-18 18:20:21 +05:30
Prashant Singh b512666ef1 ConvertXToProductId from attributes implemented 2019-07-18 14:08:36 +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
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
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
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 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 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
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
rahul shukla cc4dfcad76 issue #1160, filterable attribute & configuration updated for validation 2019-07-09 14:47:40 +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
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