Jitendra Singh
efc4a6b8c3
Issue #2177 fixed
2020-01-28 17:33:08 +05:30
Jitendra Singh
7cf72f16fe
Issue #2177 fixed
2020-01-28 17:28:58 +05:30
Jitendra Singh
4b376b5ed7
Merge pull request #2027 from Haendlerbund/introduce-company-name-and-sales-tax-id-columns
...
Introduce optional company name and sales tax id columns to customer addresses
2020-01-28 17:00:36 +05:30
Jitendra Singh
c75e4a0042
Merge pull request #2174 from jitendra-webkul/1.0
...
Issue #2173 fixed
2020-01-28 15:19:39 +05:30
Jitendra Singh
c9769717d0
Issue #2173 fixed
2020-01-28 15:18:51 +05:30
Jitendra Singh
7a77cf380a
Merge pull request #2169 from jitendra-webkul/1.0
...
Issue #2168 fixed
2020-01-28 13:58:29 +05:30
Jitendra Singh
64fd205298
Issue #2168 fixed
2020-01-28 13:47:44 +05:30
Jitendra Singh
ed2de87d06
Merge pull request #2166 from jitendra-webkul/1.0
...
Issues #1189 , #1148 fixed
2020-01-28 13:24:03 +05:30
Jitendra Singh
7b32b2e516
Issues #1189 , #1148 fixed
2020-01-28 13:18:30 +05:30
Florian Bosdorff
5188b1b7f9
Merge 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-28 08:15:11 +01:00
Florian Bosdorff
bf53dd49f3
remove unused use statement
2020-01-27 17:25:37 +01:00
Florian Bosdorff
d125f9eba0
add reporting for try-catch-sections
2020-01-27 17:06:03 +01:00
Herbert Maschke
20c2232710
remove |alpha_spaces validation from customer addresses city
2020-01-27 12:00:25 +01:00
Herbert Maschke
511d812333
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-27 11:40:18 +01:00
rahul shukla
cbaebaa388
query optimization and hide of expose model
2020-01-25 17:00:31 +05:30
Herbert Maschke
e948b30e35
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-24 15:13:16 +01:00
Jitendra Singh
f80109ba8b
Issue #2124 fixed
2020-01-24 16:11:17 +05:30
MonaHartdegen
ccc2188ef1
merge bagisto master
2020-01-24 10:22:15 +01:00
hb-monah
f6834b5196
Merge branch 'master' into new-bagisto-master
2020-01-24 10:16:11 +01:00
Jitendra Singh
4a38df3279
Fixed letter case issue in translation
2020-01-24 14:04:29 +05:30
Jitendra Singh
d1ab679e3e
Issue #2128 fixed
2020-01-24 13:54:54 +05:30
Jitendra Singh
d5c0891055
Issue #2128 fixed
2020-01-24 13:50:40 +05:30
Herbert Maschke
5ebb67dd81
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-23 14:18:17 +01:00
Jitendra Singh
da4980bfbe
Merge pull request #2116 from Haendlerbund/issue-1183/guest-checkout-configuration
...
Issue 1183/guest checkout configuration
2020-01-23 11:51:08 +05:30
Herbert Maschke
4629a3bb0f
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-22 14:59:18 +01:00
rahul shukla
0337959327
merge conflicts
2020-01-22 18:50:01 +05:30
rahul shukla
01f0fc9a57
2089 and updated codeception dependencies
2020-01-22 18:44:53 +05:30
Jitendra Singh
80a2ddb88d
Issue #1397 fixed
2020-01-22 14:58:39 +05:30
Florian Bosdorff
61d9b59e5f
Merge master into issue-1183/guest-checkout-configuration
2020-01-22 08:10:45 +01:00
rahulshukla-webkul
8bd9f0bc9d
Revert "Resolve #1183 guest checkout configuration"
2020-01-22 11:58:56 +05:30
Jitendra Singh
3aec5047f6
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
...
Resolve #1183 guest checkout configuration
2020-01-22 11:32:45 +05:30
Herbert Maschke
4596a77c07
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-21 11:36:26 +01:00
rahul shukla
e3db0b164c
conflict resolve
2020-01-21 13:24:19 +05:30
Jitendra Singh
176feecb55
Resolved conflicts
2020-01-20 19:59:04 +05:30
Jitendra Singh
b18f2292c4
Issue #2071 fixed
2020-01-20 19:57:10 +05:30
Annika Wolff
132dd6c0f0
introduce guest checkout configuration
2020-01-17 14:42:47 +01:00
Jitendra Singh
8612bd1385
Merge pull request #2069 from jitendra-webkul/1.0
...
Fixed cms textarea field issue
2020-01-17 14:58:27 +05:30
Jitendra Singh
6535afb52c
Fixed cms textarea field issue
2020-01-17 14:57:36 +05:30
Jitendra Singh
a6960f2916
Merge pull request #2068 from jitendra-webkul/1.0
...
Removed Developement menu
2020-01-17 14:49:25 +05:30
Jitendra Singh
eb3fdc12c6
Removed Developement menu
2020-01-17 14:48:39 +05:30
Jitendra Singh
880868738a
Merge pull request #2067 from jitendra-webkul/1.0
...
Issue #2058 fixed
2020-01-17 12:06:06 +05:30
Jitendra Singh
7d7e86e85c
Issue #2058 fixed
2020-01-17 12:05:28 +05:30
Annika Wolff
976d19cd74
Merge Bagisto master into Haendlerbund/Bagisto master ( #14 )
...
* added bagisto:install command
* updates for uploading attachments
* Issue #1808
* Issue #1779 fixed
* Issue #2045
* Issue #1971
* Issue #1779 fixed
* fire event on creating/updating slider
* Issue #1863 fixed
* Issue #1863 fixed
* Removed ')' in page edit blade
* Issue #2054 fixed
* Issue #2054 fixed
* Added mail from name field in .env.example file, Issue #2051
Co-authored-by: Sarthak Shrivastava <sarthak@bitfumes.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-16 13:54:18 +01:00
shubhammehrotra.symfony@webkul.com
0468b7fa58
pass locale data in view_render_event
2020-01-16 12:37:52 +05:30
Herbert Maschke
e0c2814f2e
Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns
2020-01-15 15:29:55 +01:00
Herbert Maschke
3ab9b62028
add vat_id to AddressDataGrid.php
2020-01-15 14:17:13 +01:00
Jitendra Singh
d80a3c7a5f
Merge pull request #2059 from jitendra-webkul/1.0
...
Removed ')' in page edit blade
2020-01-15 18:42:24 +05:30
Jitendra Singh
b552aba450
Removed ')' in page edit blade
2020-01-15 18:40:57 +05:30
Herbert Maschke
57aa522282
introduce company_name and vat_id also in shop admin backend
2020-01-15 14:02:51 +01:00
Jitendra Singh
915213711d
Merge pull request #2057 from jitendra-webkul/1.0
...
Issue #1863 fixed
2020-01-15 17:46:03 +05:30
Jitendra Singh
1e73cc9bc8
Issue #1863 fixed
2020-01-15 17:45:15 +05:30
Jitendra Singh
2049c45b0f
Merge pull request #2056 from jitendra-webkul/1.0
...
Issue #1863 fixed
2020-01-15 17:09:20 +05:30
Jitendra Singh
b4319e1f38
Issue #1863 fixed
2020-01-15 17:08:37 +05:30
Jitendra Singh
a7fe03602f
Merge pull request #2049 from rahulshukla-webkul/development
...
Issue #1971
2020-01-14 17:08:17 +05:30
rahul shukla
84feea8f0d
Issue #1971
2020-01-14 17:04:53 +05:30
David Große
9524c78ad5
various code style improvements
2020-01-14 10:49:22 +01:00
Jitendra Singh
0e2b8163e6
Merge pull request #2047 from jitendra-webkul/1.0
...
Issue #1779 fixed
2020-01-14 13:24:26 +05:30
Jitendra Singh
05a619d39b
Issue #1779 fixed
2020-01-14 13:23:49 +05:30
rahul shukla
7110804889
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-01-14 12:37:18 +05:30
rahul shukla
7e1b5fa693
Issue #1808
2020-01-14 12:37:03 +05:30
MonaHartdegen
4381d54029
added blank lines to improve readability
2020-01-13 17:05:32 +01:00
hb-monah
6e757413bf
Merge branch 'master' into merge-bagisto-master
2020-01-13 17:01:51 +01:00
MonaHartdegen
d225ddf04a
added channel and locale to dropdown to product data grid
2020-01-13 16:50:28 +01:00
shubhammehrotra.symfony@webkul.com
2cf8af4815
updates for uploading attachments
2020-01-13 19:38:04 +05:30
Jitendra Singh
5ce709d31a
Merge pull request #2028 from rahulshukla-webkul/development
...
Issue #1808
2020-01-10 16:57:49 +05:30
rahul shukla
6d6efbb49c
Issue #1808
2020-01-10 16:50:20 +05:30
Jitendra Singh
9faef742d7
Issue #1845 fixed
2020-01-10 13:53:11 +05:30
rahul shukla
0f0cc82058
Issue #1983
2020-01-09 13:39:13 +05:30
rahul shukla
6413cdae71
added star in state view in datagrid
2020-01-09 13:07:43 +05:30
Jitendra Singh
55df0ad02f
Merge pull request #2013 from jitendra-webkul/1.0
...
Issues #1997 , #1994 fixed
2020-01-08 17:02:39 +05:30
Jitendra Singh
ca0f8bca49
Issues #1997 , #1994 fixed
2020-01-08 17:01:50 +05:30
Jitendra Singh
a0c02e6c4a
Merge pull request #2011 from jitendra-webkul/1.0
...
Tax rates for all states
2020-01-07 19:37:42 +05:30
jitendra
fbfd710f1c
Tax rates for all states
2020-01-07 17:48:43 +05:30
Jitendra Singh
ebddf578b1
Merge pull request #1843 from Haendlerbund/feature/update-npm-assets
...
update npm assets
2020-01-07 15:34:29 +05:30
Jitendra Singh
d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
...
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
rahul shukla
7f3e3001b5
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-01-03 18:05:24 +05:30
rahul shukla
97c63ad035
review missing variavle and admin footer text
2020-01-03 18:05:14 +05:30
rahul shukla
25dff89054
translation added for locales
2020-01-03 16:12:23 +05:30
rahul shukla
9b120a978d
foter text change
2020-01-03 15:57:43 +05:30
rahul shukla
297165859f
foter text change
2020-01-03 15:35:56 +05:30
Annika Wolff
9fda68d597
merge bagisto master 7b1378f ( #10 )
...
* added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view
* added attribute (-related) factories; added functional test
* improved usage of var/let/const; fixed error on removing row
* Allow datagrid action to have target="_blank"
* The {length} didn't get properly formatted
I don't know if this is completely correct since I don't know this language, but for my language it said
```
Veld "Wachtwoord" moet ten minste {length} tekens bevatten
```
So the length didn't get replaced.
I think the locales.js needs to change
* Multiple type file error
* add two events to profile index blade view
* throw exception when session user is not available on product review page
* check guest customer configuration
* Issue #1879 and #1880
* Issue 1802.
* Issue #1792
* increase maintainability by replacing hard coded class names by <Classname>::class in ProductRepository
* Issue #1806
* fix: broken url sometimes when finishing installation,go to wrong application url
Co-authored-by: hb-monah <58027155+hb-monah@users.noreply.github.com>
Co-authored-by: Hans Schouten <account@emailo.nl>
Co-authored-by: KevinLaveto <31034266+KevinLaveto@users.noreply.github.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: Shubham Mehrotra <shubhammehrotra.symfony@webkul.com>
Co-authored-by: rahulshukla-webkul <42834394+rahulshukla-webkul@users.noreply.github.com>
2020-01-02 15:46:16 +01:00
rahul shukla
4b2088e66e
upgrade to laravel 6
2019-12-30 17:10:38 +05:30
peternuernberger
af28c35bf7
Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets
2019-12-30 09:32:49 +01:00
jitendra
7aba45486f
Indexes created for all product types
2019-12-25 19:57:05 +05:30
rahul shukla
23a15be1e0
compatible with laravel 5.8
2019-12-24 19:31:13 +05:30
Jitendra Singh
a3aa23fcbc
Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes
...
Allow empty option for attributes
2019-12-24 13:12:22 +05:30
jitendra
795561ea58
Made all changes for discount packages
2019-12-21 16:00:22 +05:30
jitendra
2d0b26d78a
Added changes on core packages for discount
2019-12-21 13:01:16 +05:30
jitendra
2380c1b597
Merged with master
2019-12-21 10:58:46 +05:30
jitendra
513b07e4cf
Added new cart rule and catalog rule
2019-12-21 10:55:32 +05:30
rahul shukla
642d99a63c
Issue #1792
2019-12-19 17:42:12 +05:30
rahul shukla
2f0338bda3
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-12-19 16:47:20 +05:30
rahul shukla
10d4613446
Issue #1879 and #1880
2019-12-19 16:47:00 +05:30
KevinLaveto
02d42d6186
Multiple type file error
2019-12-18 11:18:57 +01:00
peternuernberger
d92bb0ea72
Merge branch 'bagisto/master' into feature/update-npm-assets
2019-12-18 09:41:40 +01:00
Jitendra Singh
c26bf6c820
Merge pull request #1701 from MattApril/env-fix
...
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
rahul shukla
b033901678
Issue #1897 , added configuartion for live account in paypal
2019-12-18 11:42:07 +05:30
MonaHartdegen
5d9923bf30
improved usage of var/let/const; fixed error on removing row
2019-12-16 15:42:32 +01:00
rahul shukla
2f8e319fb0
Issue #1232 , default item in perpage and label of perpage
2019-12-16 18:56:02 +05:30
MonaHartdegen
2b0385c14e
Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes
2019-12-13 14:12:14 +01:00
rahul shukla
6af302fa95
Issue #1848
2019-12-13 17:06:32 +05:30
Jitendra Singh
9f5c82068e
Merge pull request #1889 from rahulshukla-webkul/development
...
Issue #1808
2019-12-13 14:39:54 +05:30
rahul shukla
dade205e81
Issue #1808
2019-12-12 20:10:12 +05:30
MonaHartdegen
2feb9114bd
removed remnants of laravel-web-console from development view and language files
2019-12-12 13:23:52 +01:00
MonaHartdegen
7b1378fded
added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view
2019-12-12 10:32:51 +01:00
naresh verma
183cbf34cf
resolve table prefix issue
2019-12-05 13:21:52 +05:30
Jitendra Singh
3eb7d862b1
Merge pull request #1798 from Haendlerbund/configurables-with-varying-variant-types-PR-1782
...
Configurables with varying variant types - Enhancement
2019-12-04 18:58:59 +05:30
peternuernberger
b066833068
Merge remote-tracking branch 'bagisto-hb/master' into feature/update-npm-assets
2019-12-04 11:41:17 +01:00
Jitendra Singh
1048cbc5c9
Merge pull request #1791 from thyseus/remove-alkhachatryan/laravel-web-console
...
remove alkhachatryan/laravel-web-console
2019-12-03 14:43:19 +05:30
Jitendra Singh
b7b3441607
Merge pull request #1775 from thyseus/introduce-order-item-events
...
introduce 'checkout.order.orderitem.save.[before/after]' events
2019-12-03 14:39:11 +05:30
peternuernberger
8cb3c5895a
updated publishable folders
2019-12-02 12:26:55 +01:00
peternuernberger
c1f648a17f
excluded import statements
2019-12-02 11:41:02 +01:00
peternuernberger
6c398f45bd
updated some dependencies
2019-11-29 16:46:35 +01:00
Annika Wolff
71e8e687c2
PR 1782 Enhancement: Let variants be of other types than simple
2019-11-26 13:32:42 +01:00
Herbert Maschke
ebcc66ab59
remove alkhachatryan/laravel-web-console
2019-11-25 08:02:55 +01:00
Jitendra Singh
840290f0bb
Merge pull request #1782 from Haendlerbund/introduce-product-type-helper
...
introduce ProductType Helper
2019-11-22 17:05:21 +05:30
Herbert
59d2a77d7d
two more view_render_events in sales order tabs
2019-11-22 09:46:38 +01:00
Annika Wolff
9a43776cc0
introduce ProductType Helper
2019-11-21 16:56:21 +01:00
Jitendra Singh
e3d9377dc4
Merge pull request #1770 from thyseus/introduce-two-render-events
...
introduce two view_render_event hooks in product edit form
2019-11-20 13:52:25 +05:30
Herbert
c9f97df44c
also pass $product into view_render_event()
2019-11-15 11:53:38 +01:00
Herbert
2a49c926d9
introduce two view_render_event hooks in product edit form
2019-11-15 10:01:26 +01:00
Alexey
81608be9fa
Removed useless classes usages
2019-11-13 01:35:23 +04:00
Alexey
072eddb397
Updated multilang
2019-11-13 01:30:09 +04:00
Alexey
8cdc984565
Minified back the admin UI.CSS file
2019-11-13 01:23:50 +04:00
Alexey
25ea011960
Adding Laravel Web Console to the Bagisto
2019-11-13 01:15:56 +04:00
jitendra
257392cd2a
Issue #1118 fixed
2019-11-07 17:39:59 +05:30
jitendra
65d4e8698a
Issue #924 fixed
2019-11-07 15:42:34 +05:30
jitendra
faef8adcdb
Issue #1745 fixed'
2019-11-07 12:50:40 +05:30
jitendra
19b8de0ffb
Issue #1167 fixed
2019-11-06 13:54:57 +05:30
jitendra
30e2a743e8
Issue #1303 fixed
2019-11-05 19:02:07 +05:30
jitendra
62d5fb1c15
Issue #1704 fixed (Update channel 'Base Curreny' label to 'Default Currency')
2019-11-05 16:53:46 +05:30
jitendra
08e87ccf8d
Issue #1559 fixed
2019-11-05 16:23:43 +05:30
Jitendra Singh
65a7008452
Merge pull request #1734 from rahulshukla-webkul/development
...
Issue #1733
2019-11-05 12:02:19 +05:30
rahul shukla
2f82ba1f95
Issue #1733
2019-11-05 11:20:28 +05:30
jitendra
c0a4e2fe26
Issue #1721 fixed
2019-10-31 19:06:52 +05:30
Jitendra Singh
9baf4cac3a
Merge pull request #1709 from prashant-webkul/bugs_patch_1
...
Added logo, favicon in fillable of channel model
2019-10-31 12:21:03 +05:30
Prashant Singh
e5082cca3b
Added logo, favicon in fillable of channel model
2019-10-30 10:40:12 +05:30
Matt April
3ebdde7681
Replaced direct env references of MAIL_SHOP_FROM with config file references. Also enabled optional usage of MAIL_FROM_NAME.
2019-10-26 11:09:46 -04:00
Matt April
54babf9079
Moved ADMIN_MAIL_TO into mail config
2019-10-26 11:07:41 -04:00
Jitendra Singh
3cbbbbe340
Merge pull request #1481 from codeinnovers/master
...
fix of issue #1480
2019-10-24 18:51:40 +05:30
Jitendra Singh
4fcff1e111
Merge pull request #1650 from shivam-webkul/shivam
...
[Bug Fixed #1219 ] & [Enhancement #1182 ] Fixed
2019-10-24 10:36:53 +05:30
Jitendra Singh
70b7a712c7
Merge pull request #1691 from prashant-webkul/bugs_patch_1
...
Fixed issues related to Promotions: Cart Rule
2019-10-24 10:29:39 +05:30
Prashant Singh
23237f9921
Made Catalog Rules made compatible with new product types and updated issue templates
2019-10-23 19:00:22 +05:30
Jitendra Singh
c0162e6491
Merge pull request #1689 from jitendra-webkul/jitendra
...
Issue #1686 fixed
2019-10-23 13:50:51 +05:30
jitendra
0824a47d1d
Issue #1686 fixed
2019-10-23 13:49:40 +05:30
Jitendra Singh
75eeddc1b1
Merge pull request #1665 from rumansaleem/fix-hardcoded-bagisto
...
Replace hardcoded 'Bagisto' with application name from config.
2019-10-21 12:01:26 +05:30
Amritanshu
a6f9c35738
#1303 reverted
2019-10-19 15:38:07 +05:30
Amritanshu
9fc6837386
Error pages views redirected to Admin error pages #1303 - fixed
2019-10-19 15:29:45 +05:30
Ruman Saleem
b8967a5c22
Replace hardcoded 'Bagisto' with application name - fixes #1614
2019-10-19 13:51:00 +05:30
Jitendra Singh
bfcd52618b
Merge pull request #1659 from vivek-webkul/patch-7
...
[Enhancement #1232 : Added option for showing records per page in con…
2019-10-18 20:14:57 +05:30
shivam kumar
fd8a1fb851
#1182 fixed
2019-10-18 18:43:38 +05:30
rahul shukla
859cd04660
compile all assest
2019-10-18 18:21:12 +05:30
Jitendra Singh
65d9c0b283
Merge pull request #1652 from vivek-webkul/patch-5
...
[Enhancement #737 : Fields added to the customer DataGrid and customer…
2019-10-18 17:42:07 +05:30
Jitendra Singh
ce2a9742a4
Merge pull request #1646 from vivek-webkul/patch-3
...
[Bug Fixed #1555 : order refund export related issue resolved.]
2019-10-18 17:40:30 +05:30
Vivek
5b6ce4a6ab
[Enhancement #1232 : Added option for showing records per page in configuration.]
2019-10-18 17:07:57 +05:30
Vivek
6989513c62
[Added: phone and gender columns in filter.]
2019-10-18 13:31:56 +05:30
Vivek
f8767adc0d
[Enhancement #737 : Fields added to the customer DataGrid and customer addresses section added at admin end.]
2019-10-17 18:12:51 +05:30
shivam kumar
c96dd396d9
#1219 fixed
2019-10-17 17:28:08 +05:30
Vivek
ee5a63c4e4
[Bug Fixed #1640 and #1642 : Customer delete issue resolved if any invoice is in pending.]
2019-10-17 15:17:02 +05:30
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