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
rahul shukla 61da74ee2b Issue #1447 2019-09-12 16:25:51 +05:30
Prashant Singh b089149268 Fixed issue #1428 2019-09-12 16:21:03 +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 e17c2c5f40 Merged with master 2019-09-11 15:23:57 +05:30
Jitendra Singh 8281ea0088
Merge pull request #1441 from rahulshukla-webkul/development 
error in cancel mail
 2019-09-11 13:57:41 +05:30
Jitendra Singh 3cd49daa5c
Merge pull request #1440 from prashant-webkul/development 
Fixed a translation typo in create cart rule form
 2019-09-11 13:57:35 +05:30
rahul shukla ce59e8b1d5 error in cancel mail 2019-09-11 13:55:07 +05:30
Prashant Singh e6104668e0 Fixed a translation typo in create cart rule form 2019-09-11 13:52:24 +05:30
Jitendra Singh 7c9d8a06ed
Merge pull request #1439 from prashant-webkul/development 
Removed setInvoker method and allowed property to get set in Datagrid…
 2019-09-11 13:47:01 +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
Prashant Singh d48fe8d435 Removed setInvoker method and allowed property to get set in Datagrid's constructor. 2019-09-11 12:59:51 +05:30
jitendra 1ce4dfea95 Merge cart issue fixed for downloadable product 2019-09-11 11:21:12 +05:30
Prashant Singh 1e22e61282 Base sync 2019-09-11 03:11:55 +05:30
Prashant Singh 98e8f3c57d All datagrids are generating before add column, action and mass action 2019-09-11 03:10:38 +05:30
Prashant Singh 7d7cda1f73 Datagrid add column before and after event added 2019-09-11 01:32:35 +05:30
Prashant Singh 69e46a7ddd Fixed translation issues in discount forms 2019-09-10 17:58:19 +05:30
Prashant Singh c3b54c389a Catalogrule form variables for json data encode and decode are now normalized 2019-09-10 14:54:47 +05:30
jitendra 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
Prashant Singh 6c03f824ec Refactoring in catalog rule form 2019-09-10 04:11:43 +05:30
Prashant Singh f99cb5588f Fixed issue #1428 2019-09-10 02:42:02 +05:30
rahul shukla 8d578c3720 wrong grand total in invoice 2019-09-09 15:33:05 +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 94727a4f1d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-09 12:57:44 +05:30
rahul shukla 98df7f25f7 Issue #1256 2019-09-09 12:57:28 +05:30
Prashant Singh 5651b4ed85 Cart rule form visual and translation changes 2019-09-08 02:50:11 +05:30
Prashant Singh 6a24ed723e Rogue statement found in discount amount initialization 2019-09-07 16:29:33 +05:30
rahul shukla 4d13c0586a Issue #1306 2019-09-07 15:18:24 +05:30
Jitendra Singh dede76a442
Merge pull request #1416 from rahulshukla-webkul/development 
changed in webpack
 2019-09-07 13:30:02 +05:30
rahul shukla 9e8edfa226 changed in webpack 2019-09-07 13:27:54 +05:30
Prashant Singh 1aab4ccfe3 more normalization of cart rule form variables 2019-09-07 04:48:27 +05:30
Prashant Singh c190f6f230 Cart rule form variables normalized 2019-09-07 04:28:42 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
Prashant Singh 047a34e76b Translation fixes and changes in cart rule datagrid 2019-09-06 19:04:57 +05:30
Prashant Singh 57f3cbb8af JSON parsing in cart rule update form fixes 2019-09-06 16:58:35 +05:30
Prashant Singh b1f0416ca0 Spell correction 2019-09-06 16:29:56 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
Prashant Singh 573aea9c75 Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-09-06 03:05:40 +05:30
Prashant Singh 8a6b5d4723 Assets compiled for production 2019-09-05 18:37:58 +05:30
rahul shukla 11391b2fd8 conflict resolve 2019-09-05 16:45:39 +05:30
jitendra 38f73505af Assets compiled for production 2019-09-05 15:14:45 +05:30
jitendra 1977ddd6ad Bundle product radio and checkbox added in product edit form for is default selection 2019-09-05 13:56:10 +05:30
rahul shukla 9916424e0d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 13:13:16 +05:30
rahul shukla c3d9ac8706 conflict resolve 2019-09-05 13:13:00 +05:30
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