alireza_hassani
/
willaengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
pull/23/head
Saeid 4 years ago
parent 9383df2f36
commit 4a99ff9bc5
13 changed files with 206 additions and 195 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape View File

@ -15,7 +15,7 @@ bootstrap/compiled.php
app/storage/
storage/*
storage/
# Laravel 5 & Lumen specific
public/storage
@ -37,6 +37,8 @@ Homestead.json
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
.idea/
.idea/vcs.xml
.idea/php.xml
.idea/willamall-admin.iml
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml

28
.idea/php.xml
Unescape View File

@ -127,31 +127,6 @@
<path value="$PROJECT_DIR$/vendor/mtdowling/jmespath.php" />
<path value="$PROJECT_DIR$/vendor/aws/aws-sdk-php" />
<path value="$PROJECT_DIR$/vendor/coraxster/flysystem-aws-s3-v3-minio" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/core" />
<path value="$PROJECT_DIR$/vendor/wm/blog" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/core" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/core" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/common" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/portfolio" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/wm/reservation" />
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
<path value="$PROJECT_DIR$/vendor/markbaker/complex" />
<path value="$PROJECT_DIR$/vendor/maatwebsite/excel" />
@ -166,9 +141,10 @@
<path value="$PROJECT_DIR$/vendor/wm/warehouse" />
<path value="$PROJECT_DIR$/vendor/wm/product" />
<path value="$PROJECT_DIR$/vendor/wm/service" />
<path value="$PROJECT_DIR$/vendor/league/commonmark-ext-table" />
<path value="$PROJECT_DIR$/vendor/wm/webbuilder" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
<component name="PhpUnit">
<phpunit_settings>
<PhpUnitSettings configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />

18
.idea/vcs.xml
Unescape View File

@ -2,23 +2,5 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/api-axios-handler" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/auth" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/permission" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/task" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/theme" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/uncomplete/theme" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/we-packages/url-generator" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-blog" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-common" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-core" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-crm" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-finance" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-portfolio" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-product" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-reservation" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-service" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-store" vcs="Git" />
<mapping directory="$PROJECT_DIR$/modules/wm-warehouse" vcs="Git" />
</component>
</project>

1
.idea/willamall-admin.iml
Unescape View File

@ -136,6 +136,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/service" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/store" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/warehouse" />
<excludeFolder url="file://$MODULE_DIR$/vendor/wm/webbuilder" />
<excludeFolder url="file://$MODULE_DIR$/vendor/zendframework/zend-diactoros" />
<excludeFolder url="file://$MODULE_DIR$/vendor/zircote/swagger-php" />
</content>

22
composer.json
Unescape View File

@ -21,13 +21,13 @@
"wm/common": "dev-master",
"wm/core": "dev-master",
"wm/crm": "dev-master",
"wm/finance": "dev-dev",
"wm/store": "dev-master",
"wm/product": "dev-master",
"wm/service": "dev-master",
"wm/warehouse": "dev-dev",
"wm/portfolio": "dev-master",
"wm/product": "dev-master",
"wm/reservation": "dev-master",
"wm/service": "dev-master",
"wm/store": "dev-master",
"wm/warehouse": "dev-master",
"wm/webbuilder": "dev-master",
"zircote/swagger-php": "^3.0"
},
"require-dev": {
@ -101,10 +101,6 @@
"type": "path",
"url": "./modules/wm-portfolio"
},
{
"type": "path",
"url": "./modules/wm-finance"
},
{
"type": "path",
"url": "./modules/wm-product"
@ -117,9 +113,17 @@
"type": "path",
"url": "./modules/wm-store"
},
{
"type": "path",
"url": "./modules/wm-finance"
},
{
"type": "path",
"url": "./modules/wm-warehouse"
},
{
"type": "path",
"url": "./modules/wm-webbuilder"
}
]
}

51
composer.lock generated
Unescape View File

@ -6173,11 +6173,11 @@
},
{
"name": "wm/finance",
"version": "dev-dev",
"version": "dev-master",
"dist": {
"type": "path",
"url": "./modules/wm-finance",
"reference": "9766c16ef0b5af65b1cefee6eac9cf3fa7e2fdfd"
"reference": "2c904e26440283a10a9f683ee8d9d4a476f56e07"
},
"require": {
"php": "^7.1.3",
@ -6467,6 +6467,50 @@
],
"description": "Warehouse Management Service"
},
{
"name": "wm/webbuilder",
"version": "dev-master",
"dist": {
"type": "path",
"url": "./modules/wm-webbuilder",
"reference": "ed33448a0dac6531946e37d748853b3cccf7182a"
},
"require": {
"php": "^7.2",
"wm/common": "dev-master",
"wm/core": "dev-master"
},
"require-dev": {
"orchestra/testbench": "~3.6.0",
"phpunit/phpunit": "^7.0"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"WM\\WebBuilder\\WebBuilderServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"WM\\WebBuilder\\": "src/"
},
"classmap": [
"database/seeds",
"database/factories"
]
},
"autoload-dev": {
"psr-4": {
"WM\\WebBuilder\\Tests\\": "tests/"
}
},
"license": [
"MIT"
],
"description": "webbuilder relationship management"
},
{
"name": "zendframework/zend-diactoros",
"version": "2.2.1",
@ -8655,7 +8699,8 @@
"wm/reservation": 20,
"wm/service": 20,
"wm/store": 20,
"wm/warehouse": 20
"wm/warehouse": 20,
"wm/webbuilder": 20
},
"prefer-stable": true,
"prefer-lowest": false,

3
jsconfig.json
Unescape View File

@ -13,7 +13,8 @@
"@Core/*": ["./modules/wm-core/resources/js/*"],
"@User/*": ["./modules/wm-core/resources/js/Modules/User/*"],
"@Auth/*": ["./modules/wm-core/resources/js/Modules/Authentication/*"],
"@Service/*": ["./modules/wm-core/resources/js/Modules/Service/*"],
"@Service/*": ["./modules/wm-service/resources/js/*"],
"@Product/*": ["./modules/wm-product/resources/js/*"],
"@Blog/*": ["./modules/wm-blog/resources/js/*"]
}
},

16
package-lock.json generated
Unescape View File

@ -1684,7 +1684,7 @@
},
"util": {
"version": "0.10.3",
"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
"resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
@ -1854,7 +1854,7 @@
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true
}
@ -4803,7 +4803,7 @@
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true
}
@ -9586,7 +9586,7 @@
},
"yargs": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"dev": true,
"requires": {
@ -11007,7 +11007,7 @@
},
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"sshpk": {
@ -11299,7 +11299,7 @@
},
"strip-eof": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
"resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
@ -11517,7 +11517,7 @@
},
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"thunky": {
@ -11672,7 +11672,7 @@
},
"tty-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
"resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
"dev": true
},

2
resources/js/Global/components/Inputs/Checkbox.vue
Unescape View File

@ -24,7 +24,7 @@ export default {
itemSlug: {default: 'id'},
itemText: {default: null},
text: {default: " "},
item: { default: {} },
item: {default: () => ({})},
color: {default: "Red"},
value: {type: Array}
},

3
resources/js/Global/utils/languages/index.js vendored
Unescape View File

@ -1,10 +1,11 @@
export default [
{ id: 1, name: 'فارسی', name_en:'Persian', src:'/images/Global/Flags/Persian.png', accronym_name: 'ir'},
{ id: 2, name: 'انگلیسی', name_en:'English', src:'/images/Global/Flags/English.png', accronym_name: 'en'},
{ id: 3, name: 'عربی', name_en:'Arabic', src:'/images/Global/Flags/Arabic.png', accronym_name: 'iq'},
{ id: 3, name: 'عربی', name_en:'Arabic', src:'/images/Global/Flags/Arabic.png', accronym_name: 'ar'},
{ id: 4, name: 'آلمانی', name_en:'German', src:'/images/Global/Flags/German.png', accronym_name: 'de'},
{ id: 5, name: 'چینی', name_en:'Chinese', src:'/images/Global/Flags/Chinese.png', accronym_name: 'cn'},
{ id: 6, name: 'فرانسوی', name_en:'France', src:'/images/Global/Flags/France.png', accronym_name: 'fr'},
{ id: 7, name: 'روسی', name_en:'Russian', src:'/images/Global/Flags/Russian.png', accronym_name: 'ru'},
{ id: 8, name: 'اسپانیایی', name_en:'Spanish', src:'/images/Global/Flags/Spanish.png', accronym_name: 'es'},
{ id: 9, name: 'ایتالیایی', name_en:'Italy', src:'/images/Global/Flags/Italian.png', accronym_name: 'IT'},
];

2
storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 vendored
Unescape View File

@ -1 +1 @@
1601103900i:1601103900;
1601220079i:1601220079;

2
storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c vendored
Unescape View File

@ -1 +1 @@
1601103900i:2;
1601220079i:4;

7
webpack.mix.js vendored
Unescape View File

@ -32,12 +32,11 @@ require('./modules/wm-common/webpack.mix');
require('./modules/wm-crm/webpack.mix');
require('./modules/wm-blog/webpack.mix');
require('./modules/wm-portfolio/webpack.mix');
require('./modules/wm-finance/webpack.mix');
// require('./modules/wm-finance/webpack.mix');
require('./modules/wm-product/webpack.mix');
require('./modules/wm-service/webpack.mix');
require('./modules/wm-store/webpack.mix');
require('./modules/wm-warehouse/webpack.mix');
//
// require('./modules/wm-store/webpack.mix');
// require('./modules/wm-warehouse/webpack.mix');
// require('./modules/wm-reservation/webpack.mix');
mix.version();

Write Preview
Loading…
Cancel
Save