Commit Graph

2637 Commits

Author SHA1 Message Date
Jitendra Singh 89132ca1ff
Merge pull request #1163 from rahulshukla-webkul/development
issue #1062
2019-07-08 15:46:29 +05:30
rahul shukla 6fec08f814 check updated, issue #1162 2019-07-08 15:45:15 +05:30
rahul shukla 3511c08e46 issue #1062 2019-07-08 15:38:05 +05:30
Jitendra Singh 10081847f4
Merge pull request #1161 from rahulshukla-webkul/development
Development
2019-07-08 15:11:08 +05:30
rahul shukla 79d25c7d2e issue #1060 2019-07-08 15:09:42 +05:30
Prashant Singh 223bef7c72 Removed stripe connect dependencies from SAASCustomizer package 2019-07-08 13:29:07 +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
Jitendra Singh 0e84ac682f
Merge pull request #1158 from danielpinon/patch-2
Clearing duplicity
2019-07-08 12:08:42 +05:30
Daniel Pinon 723f6ad639
Clearing duplicity 2019-07-06 23:59:59 -03:00
Daniel Pinon c5fe78014c
Updating translations of languages ​​in pt_BR 2019-07-06 23:58:01 -03:00
Prashant Singh 8c19d9e0ce removed dead code 2019-07-06 17:47:45 +05:30
Prashant Singh c8e8df1699 Added configuration for cart rules 2019-07-06 17:41:58 +05:30
Amir Shahbandegan ec40ccb41b
Added intl extension to composer.json 2019-07-06 12:01:26 +04:30
Jitendra Singh 729aaff1aa
Merge pull request #1152 from rahulshukla-webkul/development
slider edit issue
2019-07-05 18:48:40 +05:30
rahul shukla 54481ebbfe slider edit issue 2019-07-05 18:15:22 +05:30
Jitendra Singh aae9ffa9a8
Merge pull request #1151 from rahulshukla-webkul/development
Development
2019-07-05 14:18:13 +05:30
rahul shukla 2f2f97a6d0 category check condition for sorting 2019-07-05 13:33:06 +05:30
rahul shukla f9863f440f category check condition for sorting 2019-07-05 13:24:46 +05:30
Prashant Singh 3fe220428c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-05 13:23:56 +05:30
Prashant Singh e33a374e67 Shop package views reste 2019-07-05 11:18:11 +05:30
Prashant Singh bb182972f8 Fixed issue #83 2019-07-04 18:20:49 +05:30
Prashant Singh 6cb1f0f699 Fixed a bug in SAAS module core 2019-07-04 16:01:04 +05:30
Prashant Singh 65df13c545 Fixed a bug related to rul parameter 2019-07-04 15:57:13 +05:30
Jitendra Singh 2a0d15d15a
Merge pull request #1150 from rahulshukla-webkul/development
Development
2019-07-04 14:40:12 +05:30
Prashant Singh c3622fa53b Fixed bug related to preorder 2019-07-04 14:29:49 +05:30
rahul shukla cfaee2f432 issue #1147 2019-07-04 13:56:18 +05:30
Prashant Singh f5059364c2 Changes made to stripe connect, all the dependencies hard coded for connect in SAAS module had been successfully migrated 2019-07-04 13:42:05 +05:30
rahul shukla 9eb4b89344 json removed 2019-07-04 13:25:08 +05:30
rahul shukla 44a72db99e maximum price according to category 2019-07-04 13:20:21 +05:30
rahul shukla 60435b724f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-04 12:38:36 +05:30
rahul shukla c56d94f7a4 issue #968 and dependent field 2019-07-04 12:38:20 +05:30
Prashant Singh fdd3ff8779 Fixed issue with stripe 2019-07-03 18:51:35 +05:30
Prashant Singh b868887ccc Fixed preorder bug 2019-07-03 18:16:07 +05:30
Prashant Singh 80ea917581 Shop package view reset 2019-07-03 15:24:25 +05:30
Prashant Singh 7053a425c2 Fixed issue #76 2019-07-03 15:12:29 +05:30
Prashant Singh 3d552b79fe A small bug fix in shop price after login 2019-07-03 14:01:24 +05:30
Prashant Singh de87c8509f Fixed issue 2019-07-03 13:55:39 +05:30
Prashant Singh 5b3bde0d3a Fixed issue with customer document #74 2019-07-03 13:35:27 +05:30
Prashant Singh f8d38e9bbd Enabled usage parameters of cart rule in create and edit form 2019-07-03 11:37:09 +05:30
Prashant Singh dfc0941fe4 Added the purge pool configuration file in the saas module 2019-07-03 10:56:04 +05:30
Prashant Singh 42c2f07dbc Actual resource tree formed 2019-07-03 10:21:05 +05:30
Prashant Singh 71f0556e9f Updated the frontend files for show price after login and publish path changed to a general folder resources 2019-07-02 18:39:07 +05:30
Prashant Singh 2ce18e5a49 Placing the conflicted files of show price after login and preorder to the actual paths instead of altering the original shop package view files 2019-07-02 14:23:21 +05:30
Prashant Singh 46d1ec1fc9 Over ride of summary.blade.php according to stripe connect done 2019-07-02 14:15:32 +05:30
Prashant Singh 9276a695b6 Some fixes in stripe 2019-07-02 14:09:26 +05:30
Prashant Singh 9042757f4f Updated the get root categories method inside category repository class 2019-07-02 13:04:14 +05:30
Prashant Singh 12c321e80e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-02 12:45:59 +05:30
Prashant Singh bfe52a7d3c Enabling coupon usage option for cart rules and start of the program convertxtoproductid 2019-07-02 12:45:30 +05:30