Commit Graph

2835 Commits

Author SHA1 Message Date
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 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
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
Jitendra Singh a6f5ebb90f
Merge pull request #1252 from rahulshukla-webkul/development
Development
2019-08-06 15:37:11 +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