Commit Graph

1837 Commits

Author SHA1 Message Date
devansh bawari fb679bf5b0 Merge branch 'master' into issue-4399 2021-01-13 11:49:48 +05:30
Glenn Hermans 04368520c9
Merge pull request #4462 from devansh-webkul/issue-4420 2021-01-12 09:12:20 +01:00
devansh bawari 238d46a4dd Currency Symbol Issue Fixed 2021-01-12 11:41:18 +05:30
devansh bawari 389578b061 Mass Delete And Update ACL Added 2021-01-11 19:11:39 +05:30
devansh bawari 715b35c4ca Merge branch 'issue-4456' of https://github.com/devansh-webkul/bagisto into issue-4456 2021-01-11 17:54:09 +05:30
devansh bawari 70c768e21b Merge remote-tracking branch 'upstream/master' into issue-4456 2021-01-11 17:53:25 +05:30
devansh bawari f9c54383b9 Filter Added To Catalog Rule, Cart Rule And Email Template 2021-01-11 17:53:18 +05:30
devansh bawari b9d9e90bc1 Language Translation Added 2021-01-11 17:38:11 +05:30
devansh bawari 4e4394eb11 Mass Delete From Product Added 2021-01-11 17:34:44 +05:30
devansh bawari 72c8f52894 Missing ACL Added 2021-01-11 17:26:40 +05:30
Devansh 983f9c9d9d Status Exception Fixed In Content, Inventory Sources And User 2021-01-08 23:27:04 +05:30
devansh bawari e0edd790ec Fixed Some Spaces 2021-01-08 20:31:04 +05:30
devansh bawari 71abe8f4ca Arabic And Persian Support Added To DOM PDF 2021-01-08 20:23:01 +05:30
devansh bawari ca1f67df2e Filters Added 2021-01-08 19:12:19 +05:30
rahul shukla f8b5bee942 Issue #4457 fixed 2021-01-08 16:43:42 +05:30
rahul shukla def1bc6896 Issue #4447 fixed 2021-01-08 16:02:15 +05:30
devansh bawari d1c83d65cf Fallback Added 2021-01-08 11:19:46 +05:30
prateek srivastava d94f786efb Merge branch 'master' of https://github.com/bagisto/bagisto 2021-01-06 15:48:15 +05:30
jitendra ea2f1c327e Issue #4434 fixed 2021-01-05 18:30:18 +05:30
jitendra c7deb7b066 Issue #4431 fixed 2021-01-05 18:19:48 +05:30
jitendra 65d37fe6de Resolve conflicts 2021-01-04 21:43:35 +05:30
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +05:30
prateek srivastava 5935fbf28c product Image helper removed 2021-01-04 17:44:33 +05:30
Caine85 dec3757605
Fixing wrong locale in Admin notifications
Starting from Laravel 5.2, as stated in documentation (https://laravel.com/docs/5.2/upgrade#upgrade-5.2.0): 

Caching And Env
If you are using the config:cache command during deployment, you must make sure that you are only calling the env function from within your configuration files, and not from anywhere else in your application.
If you are calling env from within your application, it is strongly recommended you add proper configuration values to your configuration files and call env from that location instead, allowing you to convert your env calls to config calls.
2021-01-03 12:40:35 +01:00
devansh bawari 1e55a5c6b2 Query Fixed 2020-12-30 16:35:41 +05:30
devansh bawari b6f1fed10d Translation Added 2020-12-29 19:53:54 +05:30
devansh bawari da5b8a4ca7 Filter Added For All 2020-12-24 17:29:10 +05:30
devansh bawari ca2de63b48 Alias Filter Added 2020-12-24 16:50:40 +05:30
devansh bawari 2f124c5a3f Fixed Filter Locale & Channel List. Channel Symbol Added. 2020-12-21 19:22:31 +05:30
devansh bawari c31037d787 Some Refactoring And Index Page Filteration Added 2020-12-21 16:10:54 +05:30
devansh bawari 5539776ab9 Channel Table Seeder And Datagrid Updated 2020-12-21 14:32:55 +05:30
devansh bawari 2b6438b567 Channel Translation Completed 2020-12-21 13:58:22 +05:30
Devansh 884b945c8b Store And Update Channel Front End Comleted 2020-12-21 10:38:19 +05:30
Glenn Hermans 803075f303
Merge pull request #4360 from devansh-webkul/issue-4350
Fixed taxes not applied to Shipping Cost #4350
2020-12-18 12:46:53 +01:00
devansh bawari 88782d9327 Language Translation Added 😇 2020-12-18 17:02:55 +05:30
devansh bawari 4dd71a2e1a Text Area Issue Fixed 2020-12-14 14:05:06 +05:30
devansh bawari e49908b314 Merge branch 'master' into issue-4242 2020-12-04 20:29:07 +05:30
rahul shukla 4320f4b004 enhancement #4321 done with all required changes 2020-12-04 13:01:52 +05:30
rahul shukla 6ce2116a49 Merge branch 'development' of https://github.com/rahulcs0082/bagisto into development 2020-12-04 11:54:33 +05:30
rahulshukla-home 20a7378258 added configuration in buy now button display 2020-11-30 12:52:57 +05:30
devansh bawari fe96926179 Changes Added Which Has Been Reverted 2020-11-25 18:28:21 +05:30
devansh bawari 004dcf2663 Merge branch 'master' into issue-4242
Merged With Master
2020-11-25 17:35:32 +05:30
jitendra 711beb1786 Added Bagisto Debugbar 2020-11-24 17:48:37 +05:30
devansh bawari 937db83b3e Merge branch 'issue-4242' of https://github.com/devansh-webkul/bagisto into issue-4242
Merged
2020-11-24 12:38:05 +05:30
devansh bawari c70a324f40 Merge branch 'master' into issue-4242
Merged With Master
2020-11-24 12:27:35 +05:30
Jitendra Singh f1af54dc5e
Merge pull request #4276 from rahulcs0082/development
option to add video in advertisement and product gallery for default theme
2020-11-24 00:03:48 +05:30
devansh bawari b6c9dc1b98 Text Message Added 2020-11-23 18:32:37 +05:30
devansh bawari 6f0151806d Allowed IPs Added 2020-11-23 13:54:56 +05:30
rahulshukla-home e3a7ee9ac3 fix locale issues in admin 2020-11-20 12:54:18 +05:30
rahulshukla-home 56f1c2eb95 validation added in video upload 2020-11-20 12:33:38 +05:30
devansh bawari d68e765243 Maintenance Field Added 2020-11-20 12:17:21 +05:30
devansh bawari 001187884f Some Self Reviewed 2020-11-19 17:06:12 +05:30
rahulshukla-home 2c9b131fd3 Enhancement #4250 done for default theme 2020-11-19 15:23:51 +05:30
devansh bawari 200e0f7ef6 Language Translation Added 2020-11-18 18:50:11 +05:30
devansh bawari 1222f5d14a Integration Completed 2020-11-18 18:40:29 +05:30
rahulshukla-home 25b2603a2e Enhancement #4257 implemented 2020-11-18 12:37:33 +05:30
rahulshukla-home 4b3be2b2ca Enhancement #4257 implemented 2020-11-18 12:34:34 +05:30
Jitendra Singh d96fdaf074
Merge pull request #4249 from devansh-webkul/issue-4029
Completed feature request to have a minimum order amount #4029
2020-11-12 15:02:31 +05:30
devansh bawari 7e93672192 Translation Added 2020-11-10 18:08:50 +05:30
devansh bawari 444f36d9c5 Product Number Added For Admin Filteration 2020-11-10 17:59:47 +05:30
devansh bawari 7cfd396f47 Merge remote-tracking branch 'upstream/master' into issue-4029 2020-11-10 13:08:17 +05:30
Jitendra Singh 679594076b
Merge pull request #4245 from devansh-webkul/default_depend
Required Field Depend On Status
2020-11-09 22:02:07 +05:30
devansh bawari 19e04369f6 Dummy Translation Added 2020-11-09 18:38:18 +05:30
devansh bawari 4890420b2d Merge remote-tracking branch 'upstream/master' into issue-4029
Merged With Master
2020-11-09 18:25:37 +05:30
jitendra 67fc98db83 Conflicts resolved 2020-11-09 17:02:00 +05:30
jitendra f65c0c22a8 Updated typo for paypal label and changed the default sort order for payment methods 2020-11-09 17:00:25 +05:30
devansh bawari a3a858a459 Minimum Order Check Added To Cart 2020-11-09 16:53:32 +05:30
devansh bawari 9bc9f7e217 Console Log Removed 2020-11-09 14:56:39 +05:30
devansh bawari fd90a5ab37 Merge remote-tracking branch 'upstream/master'
Merged With Master
2020-11-09 14:20:48 +05:30
devansh bawari 433225ad81 Required Field Depend On Status 2020-11-09 14:20:32 +05:30
devansh bawari 03a1f44def Default Value Added 2020-11-06 15:53:44 +05:30
Glenn Hermans a0970f590d
Merge pull request #4153 from jaseelbavu/issue-4082
Added bulk category delete functionality
2020-11-02 17:16:33 +01:00
Jaseel P V 0de1f9e64b Added check for products in individual category delete | Fixed bug while selecting category for mass delete 2020-11-02 20:32:25 +05:30
Jitendra Singh b6dbdef04a
Merge pull request #4210 from rahulcs0082/development
Development
2020-11-02 12:24:56 +05:30
Glenn Hermans bcfe391277
Merge pull request #4159 from praem90/ISSUE_4081
add validation for discount amt field in customer group price
2020-10-30 15:12:37 +01:00
rahulshukla-home ce90a569f3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-10-30 18:22:39 +05:30
rahulshukla-home 30f9179439 removed unnecessary code in export controller 2020-10-30 18:21:39 +05:30
Glenn Hermans 6be2c6e22d
Merge pull request #4202 from devansh-webkul/issue-4105
Fixed issue with total due in cash on delivery #4105
2020-10-30 12:00:01 +01:00
rahulshukla-home e700917341 Issue #4142 fixed 2020-10-30 15:45:01 +05:30
rahulshukla-home 8f67f6cee5 Issue #3142 fixed 2020-10-30 15:43:30 +05:30
devansh bawari 906002c945 Case Added For Amount Due 2020-10-29 11:35:58 +05:30
Jitendra Singh c2480ef1f0
Merge pull request #4185 from howdu/master
Fix error with missing locale and error with route:list
2020-10-28 18:34:50 +05:30
Jitendra Singh b7e882998b
Merge pull request #4174 from AayushBhatt-webkul/master
#4134 fixed
2020-10-28 18:21:15 +05:30
unknown a0fad7f1c8 Custom Scripts 2020-10-28 18:07:04 +05:30
Mustafa Online ec006860d8
Updated some words (arabic) 2020-10-27 13:38:09 +02:00
howdu c7e0a9723e Fix error with misisng locale
Fixed this error and searhc for other files with same code.

Trying to get property 'direction' of non-object (View: /packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php)
2020-10-27 07:56:41 +00:00
unknown 33c8890f0a translation rectified 2020-10-26 19:42:27 +05:30
Jaseel P V 09e1984d7a Added check for products in category while mass delete 2020-10-24 18:40:07 +05:30
unknown b168681ad7 Merge branch 'master' of https://github.com/bagisto/bagisto into master 2020-10-23 19:23:13 +05:30
unknown 1149483c3d admin locale issue fixed 2020-10-23 19:21:04 +05:30
Jitendra Singh 7fa85b3b33
Merge pull request #4167 from asif-webkul/issue4112
fixed layout issue while edit product in RTL for multiselect type attribute #4112
2020-10-23 14:16:35 +05:30
devansh bawari 83ccfcdf35 Current Channel Added 2020-10-23 12:37:41 +05:30
mohd asif 1ace4afdce fix update #4112 2020-10-23 11:34:55 +05:30
mohd asif ed2820fa47 fixed issue #4112 2020-10-23 11:08:18 +05:30
Mohan Raj 46f366f420 add validation for discount amt field in customer group price #4081 2020-10-22 12:31:04 +05:30
Jaseel P V 8010d34a3a Added bulk category delete functionality 2020-10-21 22:26:38 +05:30
devansh bawari ee96d9d958 Channel Sent In Params 2020-10-21 13:10:45 +05:30
devansh bawari 438353c1e3 '.webp' Format Added 2020-10-19 12:02:32 +05:30
Darko 44ffada8a8 Merge remote-tracking branch 'upstream/master' 2020-10-10 14:55:14 +02:00
darko 64aa1ded11 Fixed validation message on entering non numeric data for tax_rate in create and edit tax view. 2020-10-10 14:46:53 +02:00