Commit Graph

2553 Commits

Author SHA1 Message Date
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
jitendra 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +05:30
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +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 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 beb579587c Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-08-16 17:47:39 +05:30
Prashant Singh bd6e0c9345 Structural changes in CMS pages. Fixed bugs #1300, #1295 2019-08-16 17:43:58 +05:30
Prashant Singh 39a07f0bd0 Structural changes in CMS pages 2019-08-16 17:36:47 +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 67ea34f05e base sync 2019-08-14 14:03:21 +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 de1c00f15e Fixed issue #1295 2019-08-14 13:49:04 +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
Jitendra Singh ede01cb940
Merge pull request #1290 from rahulshukla-webkul/development
Development
2019-08-14 12:58:40 +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
Jitendra Singh 3d3d823372
Merge pull request #1274 from hChamran/hChamranpatch-1
Add fa lang
2019-08-13 11:35:12 +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