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

1049 Commits

Author SHA1 Message Date
Vivek 6ab2d5046c [Bug Fixed #1555: order refund export related issue resolved.] 2019-10-17 12:36:09 +05:30
jitendra f92b58be65 Issue #1552 fixed 2019-10-14 14:47:47 +05:30
jitendra fe688852c5 Resolve conflicts 2019-10-14 12:25:43 +05:30
jitendra b24c2507e8 Issue #1250 fixed 2019-10-14 12:22:58 +05:30
Jitendra Singh 79a3abeb55
Merge pull request #1619 from jitendra-webkul/jitendra 
Issue #1609 fixed
 2019-10-14 11:33:44 +05:30
jitendra 707ff1207c Issue #1609 fixed 2019-10-14 11:32:50 +05:30
Jitendra Singh 53750b73ce
Merge pull request #1617 from jitendra-webkul/jitendra 
Issue #1609 fixed
 2019-10-14 10:15:17 +05:30
jitendra aa44440fef Issue #1609 fixed 2019-10-14 10:14:18 +05:30
Jitendra Singh 0e900ac4b9
Merge pull request #1603 from jitendra-webkul/jitendra 
Issue #1552 fixed
 2019-10-11 12:33:44 +05:30
jitendra 660f4173d1 Issue #1552 fixed 2019-10-11 12:32:44 +05:30
Jitendra Singh db7013be3f
Merge pull request #1579 from prashant-webkul/development 
Datagrid actions enhancement
 2019-10-11 11:52:25 +05:30
jitendra a7d44e9daa Issue #1584 fixed 2019-10-11 10:35:51 +05:30
jitendra 2dedd5fbbf Issue #1581 fixed 2019-10-10 19:46:19 +05:30
jitendra 64198cae11 Issue #1580 fixed 2019-10-10 19:42:35 +05:30
jitendra 121c7c7e36 Issue #1585 fixed 2019-10-10 19:37:31 +05:30
jitendra 4bf577c37b Issue #1578 fixed 2019-10-10 19:31:08 +05:30
Webkul 9e2e73d0b3 Datagrid actions enhancement, now action can have a key called condition which must return boolean in order to trigger that action's visibility 2019-10-10 13:53:36 +05:30
jitendra c8505d3fbc Updated refund with new product types 2019-10-09 19:59:53 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla 2020006d47 Issue #1548 2019-10-07 13:15:07 +05:30
Jitendra Singh b64c7241ba
Merge pull request #1533 from prashant-webkul/development 
Fixed issue #1532
 2019-10-01 10:06:11 +05:30
Webkul 109c99f3da Made footer text content optional from configuration apart from custom content also 2019-09-30 15:57:35 +05:30
rahul shukla 2d0094f330 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-26 17:51:48 +05:30
rahul shukla 53a275f1fd translation for depandent field 2019-09-26 17:51:28 +05:30
Jitendra Singh 04c93e2339
Merge pull request #1527 from prashant-webkul/development 
Development
 2019-09-26 17:07:16 +05:30
Prashant Singh f6ce3643c0 Fixed issue #1524 2019-09-26 16:45:44 +05:30
rahul shukla 6125252fda Change Invoice to Order in Invoice Order configuration 2019-09-24 17:20:26 +05:30
Jitendra Singh 30626a1c20
Merge pull request #1496 from ghermans/admin 
Started improving the admin scss files
 2019-09-24 16:26:27 +05:30
Jitendra Singh d8e1ae5baf
Merge pull request #1512 from jitendra-webkul/refund 
Dashboard avg sale issue fixed
 2019-09-24 12:41:46 +05:30
jitendra 1acf86acf8 Dashboard avg sale issue fixed 2019-09-24 12:35:18 +05:30
Glenn Hermans cb9fd50a6a
Fixed typo 2019-09-23 14:33:54 +02:00
Jitendra Singh 35acdc5e0a
Merge pull request #1508 from jitendra-webkul/refund 
Refuned total issue fixed
 2019-09-23 16:50:07 +05:30
jitendra 1fc043b5b7 Refuned total issue fixed 2019-09-23 16:49:34 +05:30
Jitendra Singh ecc144b7b5
Merge pull request #1507 from jitendra-webkul/refund 
Dashboard sales calculation issue fixed
 2019-09-23 15:31:20 +05:30
jitendra 6cf1879920 Dashboard sales calculation issue fixed 2019-09-23 15:26:21 +05:30
Jitendra Singh 117c616661
Merge pull request #1505 from rahulshukla-webkul/development 
#1504
 2019-09-23 12:51:56 +05:30
jitendra 1bee8c0dde Issue #1492 fixed 2019-09-23 12:50:40 +05:30
rahul shukla 93101de44c #1504 2019-09-23 12:36:07 +05:30
jitendra 04ef6a6882 Item status added in refund create page items table 2019-09-20 19:45:52 +05:30
jitendra aa6f5affc0 Removed comment from Order.php listener file 2019-09-20 19:38:42 +05:30
jitendra 7a56f5761f Refund feature added 2019-09-20 19:36:41 +05:30
ghermans 79adb77380 Started improving the admin scss files 2019-09-20 02:40:25 +02:00
jitendra b0e9328090 Issue #1492 fixed 2019-09-19 18:57:58 +05:30
Jitendra Singh e87968da70
Merge pull request #1485 from jitendra-webkul/refund 
Refund issues fixed
 2019-09-19 13:53:06 +05:30
jitendra ccd86eee76 Refund issues fixed 2019-09-19 13:52:33 +05:30
CodeInnovers 01b6f86c3e fixed issue #1480 2019-09-18 23:08:27 +05:30
Jitendra Singh cee52398a1
Merge pull request #1478 from jitendra-webkul/refund 
Refund
 2019-09-18 19:12:40 +05:30
jitendra 4e856d02e8 Redund status added 2019-09-18 19:06:25 +05:30
Jitendra Singh 7619ede6a2
Merge pull request #1476 from jitendra-webkul/refund 
Refund system completed
 2019-09-18 18:59:48 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
rahul shukla 8429a5fccf dashboard dats issue 2019-09-17 16:56:45 +05:30
Jitendra Singh 58306e3252
Merge pull request #1448 from prateek-webkul/master 
Issue #1442 fixed
 2019-09-16 10:19:58 +05:30
prateek srivastava f4f5dd3b08 translation added 2019-09-13 15:41:38 +05:30
rahul shukla c39255e254 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-13 14:35:29 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
Prashant Singh a7b2925db4 Fixed issue #1452 2019-09-13 11:01:54 +05:30
Jitendra Singh cdbd654f4f
Merge pull request #1451 from prashant-webkul/development 
Development
 2019-09-13 10:18:24 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
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
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