rahul shukla
e61d89a3d0
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2021-01-18 16:24:09 +05:30
rahul shukla
142f04ad41
fixing as per comment
2021-01-18 16:23:53 +05:30
Glenn Hermans
2b276acd55
Merge pull request #4493 from devansh-webkul/temp-fix
...
Manual Require Added Till Merging Of Autoloading Fix #4420
2021-01-18 10:59:48 +01:00
devansh bawari
99f797c814
Manual Require Added
2021-01-18 10:51:32 +05:30
Glenn Hermans
0a22c34b4d
Merge pull request #4485 from devansh-webkul/issue-4481
...
Fixed shipping costs which are not calculated with grand total #4481
2021-01-15 23:13:48 +01:00
rahul shukla
57b89f53ee
enhancement #4468 added for velocity theme
2021-01-15 19:00:55 +05:30
Poghos Boyajyan
705350f932
Added condition that allow to use repository in console mode
2021-01-15 17:05:10 +04:00
rahul shukla
3420f282ff
Issue #4432 fixed
2021-01-15 18:26:27 +05:30
rahul shukla
228473851e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2021-01-15 16:53:42 +05:30
Glenn Hermans
1368124ed4
Merge pull request #4464 from devansh-webkul/issue-4399
...
Fixed role-based security issue in which user with no permission has acces to some admin pages/controls #4399
2021-01-15 12:19:17 +01:00
rahul shukla
349c39fdc9
Enhancement #4468 done
2021-01-15 15:57:54 +05:30
rahul shukla
ada41f9416
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2021-01-15 13:28:06 +05:30
rahul shukla
6d59ac6515
Issue #4486 fixed
2021-01-15 13:27:46 +05:30
devansh bawari
bf154aa2c4
Added Case Back
2021-01-15 11:09:07 +05:30
Glenn Hermans
c127e7429c
Added publish path for shop views
2021-01-14 18:08:57 +01:00
devansh bawari
567d3b6380
Merge remote-tracking branch 'upstream/master' into issue-4399
2021-01-14 20:16:49 +05:30
devansh bawari
a37f0dc027
Latest Translation Key Added
2021-01-14 20:16:35 +05:30
devansh bawari
88ac63470e
ACL Added For Addresses, Notes, Promotions And Copy Product
2021-01-14 20:06:12 +05:30
Glenn Hermans
745f9ea337
Updated status and calculate tax for admin
2021-01-14 03:52:15 +01:00
devansh bawari
af78612c54
Merge remote-tracking branch 'upstream/master' into issue-4399
2021-01-13 18:51:31 +05:30
Glenn Hermans
7fd932992e
Merge pull request #4469 from dejavuejs/patch-2
...
Asynchronous callbacks for checkout page.
2021-01-13 14:00:55 +01:00
devansh bawari
0283c56df1
Syncing Of Method With Routes
2021-01-13 18:30:20 +05:30
devansh bawari
27e26d7d35
Feature Hidden If Not Authorised
2021-01-13 18:29:57 +05:30
Glenn Hermans
534a1e3b6e
Merge pull request #4475 from rahulshukla-webkul/development
...
Issue #4392 fixed
2021-01-13 13:58:58 +01:00
rahul shukla
2af7c2cdc1
Issue #4392 fixed
2021-01-13 16:42:47 +05:30
Glenn Hermans
e3657312a3
Merge pull request #4458 from rahulshukla-webkul/development
2021-01-13 12:08:48 +01:00
Glenn Hermans
131cab7239
Merge pull request #4472 from devansh-webkul/issue-4428
...
Fixed user roles permission option which are always save when trying to uncheck selected option #4428
2021-01-13 12:08:07 +01:00
devansh bawari
86a7846fb8
Language Translation Added
2021-01-13 13:42:34 +05:30
devansh bawari
a3b8e67d6d
Tax Rate Fixed
2021-01-13 13:36:22 +05:30
devansh bawari
54c2cc8cca
Tax Rate Category Fixed
2021-01-13 13:35:47 +05:30
devansh bawari
34ba8d5e64
ACL Added
2021-01-13 13:34:22 +05:30
rahul shukla
c4c871342e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2021-01-13 12:35:35 +05:30
rahul shukla
e541ce564f
fixes as per comment
2021-01-13 12:34:47 +05:30
devansh bawari
fb679bf5b0
Merge branch 'master' into issue-4399
2021-01-13 11:49:48 +05:30
devansh bawari
95e0a084c7
Empty Role Issue Fixed
2021-01-13 11:27:12 +05:30
Glenn Hermans
c38b2bf420
Merge pull request #4466 from devansh-webkul/spliting-request
2021-01-12 15:10:11 +01:00
Deja Vue
487f40a3e5
Update onepage.blade.php
2021-01-12 19:34:52 +05:30
Deja Vue
075261ec44
Update onepage.blade.php
2021-01-12 19:29:15 +05:30
devansh bawari
bfce18c60e
Request Splitted To Reduce Load From The Checkout Page
2021-01-12 14:06:45 +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
65627ceede
Issue #4459 fixed
2021-01-08 19:02:17 +05:30
rahul shukla
a419661b1e
Issue #4455 fixed
2021-01-08 18:48:09 +05:30
rahul shukla
f8b5bee942
Issue #4457 fixed
2021-01-08 16:43:42 +05:30
rahul shukla
2dc5607cdc
removed unecessary code
2021-01-08 16:11:27 +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
Glenn Hermans
445d116fc0
Merge pull request #4424 from rahulshukla-webkul/development
...
sue #3002 fixed.
2021-01-06 08:08:25 +01:00
rahul shukla
f38bc5c8a4
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2021-01-06 12:34:36 +05:30
Jitendra Singh
f35ece7ffa
Merge pull request #4438 from jitendra-webkul/master
...
Issue #4434 fixed
2021-01-05 18:46:15 +05:30
jitendra
ea2f1c327e
Issue #4434 fixed
2021-01-05 18:30:18 +05:30
Jitendra Singh
e28e4eef4a
Merge pull request #4437 from jitendra-webkul/master
...
Issue #4431 fixed
2021-01-05 18:27:58 +05:30
jitendra
c7deb7b066
Issue #4431 fixed
2021-01-05 18:19:48 +05:30
Glenn Hermans
fd08d1786f
Merge pull request #4426 from devansh-webkul/issue-4423
...
Fixed quantity box position in RTL #4423
2021-01-05 12:49:31 +01:00
Jitendra Singh
b14a16be06
Merge pull request #4429 from jitendra-webkul/master
...
Email marketing added
2021-01-05 11:50:53 +05:30
devansh bawari
86b30eec7f
Recompiled
2021-01-05 11:23:53 +05:30
devansh bawari
64fc472953
Merge remote-tracking branch 'upstream/master' into issue-4423
2021-01-05 11:22:48 +05:30
Jitendra Singh
5020736bed
Merge pull request #4427 from devansh-webkul/issue-4425
...
Fixed saved billing address details which are not showing on onepage checkout #4425
2021-01-05 11:19:28 +05:30
devansh bawari
9312bf4809
Space Fixed
2021-01-05 10:26:42 +05:30
devansh bawari
ba48286490
Compiled Assets
2021-01-05 10:10:41 +05:30
devansh bawari
dc0b5f95db
Fixed Name Issue For Both
2021-01-05 09:48:54 +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
devansh bawari
a6bfcddf75
Default Quantity Group Layout Fixed
2021-01-04 20:52:35 +05:30
devansh bawari
b392eec9cf
Name Issue Fixed
2021-01-04 19:48:01 +05:30
devansh bawari
a909905c0e
Quantity Issue Fixed
2021-01-04 18:56:17 +05:30
devansh bawari
e9f94daf5a
Fixed Checkboxes And Addresses
2021-01-04 16:30:37 +05:30
devansh bawari
2f3895e66f
Class Added
2021-01-04 15:47:48 +05:30
rahul shukla
203148b3f8
merge with master
2021-01-04 13:51:02 +05:30
rahul shukla
16ee78698a
Issue #3002 fixed
2021-01-04 13:48:56 +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
3fe1b76354
Merge branch 'master' into issue-4192
2020-12-31 17:30:23 +05:30
Glenn Hermans
fbe8758520
Merge pull request #4410 from devansh-webkul/issue-4408
...
Fixed silder image not work #4408
2020-12-31 10:01:35 +01:00
devansh bawari
a654fac21b
Runtime Handled
2020-12-31 11:46:04 +05:30
devansh bawari
1e55a5c6b2
Query Fixed
2020-12-30 16:35:41 +05:30
devansh bawari
c8d44007a3
Merge remote-tracking branch 'upstream/master' into web-vital-v1
2020-12-30 15:47:59 +05:30
Glenn Hermans
8151803342
Merge pull request #4412 from devansh-webkul/master
...
Test Case Fix
2020-12-30 10:00:30 +01:00
devansh bawari
926c17554b
Fixed Some Layouts
2020-12-30 13:31:24 +05:30
Jitendra Singh
dfe8374f63
Merge pull request #4411 from rahulshukla-webkul/development
...
added removed condtion for multiselect serach
2020-12-30 13:06:51 +05:30
devansh bawari
7863fcfbfb
Merge remote-tracking branch 'upstream/master' into web-vital-v1
2020-12-30 10:13:29 +05:30
devansh bawari
507403c4cc
Some Comments Updated
2020-12-30 09:56:06 +05:30
devansh bawari
a0143da28d
Some Changes Done For Test Case
2020-12-30 09:53:08 +05:30
Glenn Hermans
7ea7eadfb6
Merge pull request #4363 from shubhwebkul/master
...
core's function is used to fetch current channel code
2020-12-30 03:20:25 +01:00
rahul shukla
53ea1f2abf
added removed condtion for multiselect serach
2020-12-29 20:39:17 +05:30
rahul shukla
fec96337c0
added removed condtion for multiselect serach
2020-12-29 20:35:37 +05:30
devansh bawari
b6f1fed10d
Translation Added
2020-12-29 19:53:54 +05:30
devansh bawari
995f1d3149
Merge branch 'master' into web-vital-v1
2020-12-29 17:29:49 +05:30
rahul shukla
e723eb0872
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-12-29 15:53:57 +05:30
rahul shukla
759ca310f4
Issue #4369 fixed
2020-12-29 15:53:39 +05:30