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

3682 Commits

Author SHA1 Message Date
Herbert Maschke 6eacf880a4 use an locale from a country in europe so the vat id can be generated 2020-01-22 10:38:35 +01:00
Herbert Maschke 8d1d03d25b Merge branch 'bagisto/master' into introduce-company-name-and-sales-tax-id-columns 2020-01-21 13:44:09 +01:00
Jitendra Singh c22213c97f
Merge pull request #2086 from jitendra-webkul/1.0 
PHP version updated in composer.json
 2020-01-21 17:02:39 +05:30
Jitendra Singh 3046aa617b PHP version updated in composer.json 2020-01-21 17:02:01 +05:30
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country 
introduce default_country application configuration key
 2020-01-21 16:34:38 +05:30
Jitendra Singh 85a27eeb58
Merge pull request #2085 from rahulshukla-webkul/development 
php version updated for installer.
 2020-01-21 16:07:41 +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 4bb13981bb php version updated for installer. 2020-01-21 16:05:44 +05:30
Jitendra Singh 24f30c8110
Merge pull request #2084 from jitendra-webkul/1.0 
PHP version updated in readme file
 2020-01-21 15:55:32 +05:30
Jitendra Singh 6f12f21625 PHP version updated in readme file 2020-01-21 15:54:46 +05:30
Jitendra Singh 38a24626cc
Merge pull request #2083 from jitendra-webkul/1.0 
Cart rule and catalog rule updated for laravel 6.0
 2020-01-21 15:52:30 +05:30
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
Jitendra Singh 50bf92d658
Merge pull request #2082 from rahulshukla-webkul/6.0 
6.0
 2020-01-21 15:30:23 +05:30
rahul shukla 4f1e20d23c conflict resolve 2020-01-21 15:28:16 +05:30
rahul shukla 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh a8a28ccf60
Merge pull request #2081 from jitendra-webkul/1.0 
Issue #2075 fixed
 2020-01-21 12:58:57 +05:30
Jitendra Singh 5cc7b4aae2 Issue #2075 fixed 2020-01-21 12:58:11 +05:30
Jitendra Singh 2a9c3a04d5
Merge pull request #2080 from jitendra-webkul/1.0 
Issue #2071 fixed
 2020-01-20 19:59:42 +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
Jitendra Singh 6b3415f0e8
Merge pull request #2076 from jitendra-webkul/1.0 
Issue #2074 fixed
 2020-01-20 15:27:59 +05:30
Jitendra Singh 7e14737f8c Issue #2074 fixed 2020-01-20 15:26:31 +05:30
Jitendra Singh dfa4272cf2
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots 
Set correct category url_path in multiple root categories environment
 2020-01-20 13:27:04 +05:30
Herbert Maschke bc44867956 check if date_of_birth and oldpassword are set in request in profile edit action 2020-01-20 08:54:06 +01:00
Herbert Maschke 7c9908401f improve the way server side validation errors are being displayed 2020-01-17 12:54:02 +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
Jitendra Singh a341c9291e
Merge pull request #2050 from Haendlerbund/remove-composer-lock-from-gitignore 
remove composer.lock from .gitignore
 2020-01-17 11:47:51 +05:30
Jitendra Singh 22b17acee3
Merge pull request #2064 from shubhwebkul/master 
pass locale data in view_render_event
 2020-01-17 11:13:39 +05:30
shubhammehrotra.symfony@webkul.com ba355a6f31 passing data from slider repository instead of id 2020-01-16 16:22:00 +05:30
Herbert Maschke d281aa373b remove factories (except necessary ones) from this pull request, as we deliver them as a separate PR 2020-01-16 09:54:04 +01:00
shubhammehrotra.symfony@webkul.com 0468b7fa58 pass locale data in view_render_event 2020-01-16 12:37:52 +05:30
Jitendra Singh c2fdfb8921
Merge pull request #2063 from rahulshukla-webkul/development 
Added mail from name field in .env.example file, Issue #2051
 2020-01-16 11:09:54 +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 ab28b75eff add validation rule 2020-01-15 15:29:31 +01:00
rahul shukla 5a590db145 Added mail from name field in .env.example file, Issue #2051 2020-01-15 19:27:51 +05:30
Jitendra Singh ab8001d20c
Merge pull request #2062 from jitendra-webkul/1.0 
Issue #2054 fixed
 2020-01-15 19:08:54 +05:30
Jitendra Singh 130ed41044 Issue #2054 fixed 2020-01-15 19:07:12 +05:30
Jitendra Singh d931571c35
Merge pull request #2061 from jitendra-webkul/1.0 
Issue #2054 fixed
 2020-01-15 19:03:59 +05:30
Jitendra Singh 9e5fc5bf1e Issue #2054 fixed 2020-01-15 19:03:07 +05:30
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