Skip to content
Permalink
Browse files

Merge pull request #433 from ever-co/develop

Develop
  • Loading branch information...
evereq committed Apr 12, 2019
2 parents e4cd45f + cf57a2f commit 6f5b6ad7c4645bb1ba339e191685aaee37170038
Showing with 10,263 additions and 8,985 deletions.
  1. +28 −24 README.md
  2. +9 −9 admin/website-angular/package.json
  3. +3 −0 admin/website-angular/src/app/@core/data/productsCategory.service.ts
  4. +10 −6 admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
  5. +0 −4 admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
  6. +50 −21 ...website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
  7. +1 −1 admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
  8. +2 −60 admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
  9. +37 −18 .../website-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts
  10. +16 −3 admin/website-angular/src/app/@shared/product/categories/forms/product-categories-forms.module.ts
  11. +11 −7 admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.html
  12. +55 −39 admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
  13. +10 −0 admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
  14. +2 −11 admin/website-angular/src/app/@shared/product/forms/product-forms.module.ts
  15. +13 −4 admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.html
  16. +3 −0 admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
  17. +7 −0 .../warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.html
  18. 0 ...-table.component.scss → add-warehouse-products-table/add-warehouse-products-table.component.scss}
  19. +222 −0 ...ed/warehouse-product/forms/add-warehouse-products-table/add-warehouse-products-table.component.ts
  20. +1 −0 admin/website-angular/src/app/@shared/warehouse-product/forms/add-warehouse-products-table/index.ts
  21. +15 −4 admin/website-angular/src/app/@shared/warehouse-product/forms/warehouse-product-forms.module.ts
  22. +8 −7 .../@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
  23. +188 −174 ...pp/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
  24. +3 −3 ...rc/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.html
  25. +6 −6 .../src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
  26. +5 −0 admin/website-angular/src/app/@theme/styles/styles.scss
  27. +2 −8 admin/website-angular/src/app/pages/+products/products.module.ts
  28. +7 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.html
  29. +6 −1 admin/website-angular/src/app/pages/+setup/+merchants/components/account/account.component.ts
  30. +7 −0 ...n/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.html
  31. +13 −1 admin/website-angular/src/app/pages/+setup/+merchants/components/basic-info/basic-info.component.ts
  32. +3 −1 admin/website-angular/src/app/pages/+setup/+merchants/components/components.module.ts
  33. +7 −0 ...bsite-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.html
  34. +6 −1 ...website-angular/src/app/pages/+setup/+merchants/components/contact-info/contact-info.component.ts
  35. +13 −1 ...bsite-angular/src/app/pages/+setup/+merchants/components/instructions/instructions.component.html
  36. +7 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.html
  37. +6 −1 admin/website-angular/src/app/pages/+setup/+merchants/components/location/location.component.ts
  38. +7 −0 ...ite-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.html
  39. +6 −1 ...bsite-angular/src/app/pages/+setup/+merchants/components/manufacturing/manufacturing.component.ts
  40. +7 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.html
  41. +6 −1 admin/website-angular/src/app/pages/+setup/+merchants/components/payments/payments.component.ts
  42. +60 −5 ...r/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.html
  43. +101 −11 ...lar/src/app/pages/+setup/+merchants/components/product-categories/product-categories.component.ts
  44. +4 −0 ...ular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.html
  45. +67 −0 ...ngular/src/app/pages/+setup/+merchants/components/products/add-products/add-products.component.ts
  46. +7 −0 .../app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.html
  47. +108 −0 ...rc/app/pages/+setup/+merchants/components/products/product-mutation/product-mutation.component.ts
  48. +7 −0 .../app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.html
  49. +64 −0 ...rc/app/pages/+setup/+merchants/components/products/products-catalog/products-catalog.component.ts
  50. +153 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.html
  51. +16 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.scss
  52. +184 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.component.ts
  53. +32 −0 admin/website-angular/src/app/pages/+setup/+merchants/components/products/products.module.ts
  54. +31 −0 ...pp/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.html
  55. +8 −1 .../app/pages/+setup/+merchants/components/settings/delivery-takeaway/delivery-takeaway.component.ts
  56. +49 −10 .../website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.html
  57. +11 −0 .../website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.scss
  58. +50 −6 admin/website-angular/src/app/pages/+setup/+merchants/components/settings/orders/orders.component.ts
  59. +85 −223 admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.html
  60. +5 −2 admin/website-angular/src/app/pages/+setup/+merchants/merchants.component.ts
  61. +2 −0 admin/website-angular/src/app/pages/+setup/+merchants/merchants.module.ts
  62. +6 −9 ...website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.html
  63. +17 −200 ...n/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
  64. +4 −9 admin/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts
  65. +34 −0 admin/website-angular/src/assets/i18n/bg.json
  66. +34 −0 admin/website-angular/src/assets/i18n/en.json
  67. +34 −0 admin/website-angular/src/assets/i18n/he.json
  68. +34 −0 admin/website-angular/src/assets/i18n/ru.json
  69. +2,388 −1,841 admin/website-angular/yarn.lock
  70. +1 −1 backend/api/package.json
  71. +32 −4 backend/api/yarn.lock
  72. +12 −13 carrier/mobile-ionic/package.json
  73. +1,469 −1,945 carrier/mobile-ionic/yarn.lock
  74. +11 −13 merchant/tablet-ionic/package.json
  75. +1,578 −1,972 merchant/tablet-ionic/yarn.lock
  76. 0 {shop/mobile-ionic/src/app → shared/core-angular}/components/ngx-barcode/ngx-barcode.component.ts
  77. 0 {shop/mobile-ionic/src/app → shared/core-angular}/components/ngx-barcode/ngx-barcode.module.ts
  78. +4 −1 shared/core/enums/OrderBarcodeTypes.ts
  79. +13 −13 shop/mobile-ionic/package.json
  80. +1 −1 shop/mobile-ionic/src/app/pages/+products/+order/takeaway/common/takeaway-common.module.ts
  81. +655 −831 shop/mobile-ionic/yarn.lock
  82. +1 −1 shop/website-angular/package.json
  83. +1 −1 shop/website-angular/tsconfig.json
  84. +1 −1 shop/website-angular/tsconfig.webpack.json
  85. +2,081 −1,454 shop/website-angular/yarn.lock
@@ -13,16 +13,16 @@
- Modern & Open Platform for **On-Demand Economy**
- Supports Single-Store and Multi-Store / Multi-Vendor / Peer-to-Peer Marketplaces
- Everything Reactive, Real-Time and Blazing Fast!
- Headless Commerce framework, which allows different implementations of store-fronts, Admin UIs and client apps. Exposes rich GraphQL, REST and WS APIs.
- Headless Commerce framework, which allows different implementations of store-fronts, Admin UIs and client apps. It exposes rich GraphQL, REST and WS APIs.
- Mobile ordering App for customers to make On-Demand orders (Hybrid / PWA, iOS and Android using Ionic / Ionic Native)
- Carrier (Driver) Mobile App for deliveries by carriers, drivers or service providers (iOS and Android using Ionic / Ionic Native)
- Customizing Shopping e-commerce Website for customers to make in-browser On-Demand purchases of food, goods or services
- Merchant Tablet App for Stores/Merchants/Warehouses to manage & track orders, organize deliveries, etc.
- Admin Website used to manage all platform features and settings in the single Web-based interface
- Multi-language and culture settings accross Platform (i18N)
- Multi-language and culture settings across Platform (i18N)
- Products Catalogs (global and per Merchant) with Multiple Product Images
- Inventory/Stock Management and Real-time Order Management/Processing accross the Platform
- Deliveries/Shipping management and processing accross Platform (shipping with real-time location tracking for On-Demand orders)
- Inventory/Stock Management and Real-time Order Management/Processing across the Platform
- Deliveries/Shipping management and processing across Platform (shipping with real-time location tracking for On-Demand orders)
- Real-Time discounts, promotions and products/services availability updates
- Customers registration, Guest Checkouts, Invitations (optional)
- Gateway and Payment Processing (currently supported Payments Gateway - [Stripe](https://stripe.com))
@@ -32,7 +32,7 @@

- Tax Calculations
- Third-party Shipping providers integrations
- Users Roles / Permissions accross Platform
- Users Roles / Permissions across Platform
- Large products catalogs with products variants, facets and full-text search

You can also track feature requests from the community in the [separate repo](https://github.com/ever-co/feature-requests/issues).
@@ -62,23 +62,27 @@ Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_wi

Please refer to our official [Platform Documentation](https://docs.ever.co) and to our [Wiki](https://github.com/ever-co/ever/wiki) (WIP).

For quick overview of each project in the Platform (Server, Admin, Shops, etc), you can search for README.md file in the root of the projects folders. For example, see [./backend/api/README.md](backend/api/README.md) for Server (Backend) related overview.
For a quick overview of each project in the Platform (Server, Admin, Shops, etc.), you can search for README.md file in the root of the projects folders. For example, see [./backend/api/README.md](backend/api/README.md) for Server (Backend) related overview.

## Getting Started

We follow [Gitflow Workflow](https://nvie.com/posts/a-successful-git-branching-model) so the [`develop` branch](https://github.com/ever-co/ever/tree/develop) may be in an unstable or even broken state during development. Please use [releases](https://github.com/ever-co/ever/releases) or [`master` branch](https://github.com/ever-co/ever/tree/master) instead of the `develop` branch in order to get more stable code.
We follow [Gitflow Workflow](https://nvie.com/posts/a-successful-git-branching-model), so the [`develop` branch](https://github.com/ever-co/ever/tree/develop) may be in an unstable or even broken state during development. Please use [releases](https://github.com/ever-co/ever/releases) or [`master` branch](https://github.com/ever-co/ever/tree/master) instead of the `develop` branch in order to get more stable code.

### Clone Repo

Clone the Ever Platform Git repo:

```
git clone -c core.symlinks=true --recursive git@github.com:ever-co/ever.git
git clone -c core.symlinks=true --recursive https://github.com/ever-co/ever.git
```

Note: it's important to enable Git symlinks because they are used for shared modules (every project have symlinks to common shared modules in the /shared folder)
Notes:

- if you want to use development branch (unstable, but latest development) clone using `--branch develop`
- it's necessary to enable Git symlinks because they used for shared modules (every project has symlinks to shared modules in the /shared folder)
- because of symlinks, you may need to clone from an elevated command prompt (on Windows)

If you use Git >= v2.14, it probably make sense to setup following globally:
If you use Git >= v2.14, it probably makes sense to setup following globally:

```
git config --global core.symlinks true
@@ -93,28 +97,28 @@ Notes:

### Yarn

Currently we are using `Yarn` (instead of `npm`), so make sure you have latest Yarn version installed before running Ever Platform:
Currently, we are using `Yarn` (instead of `npm`), so make sure you have latest Yarn version installed before running Ever Platform:

```
npm install -g yarn@latest
```

### Quick installation

After git repo is cloned, just run following command to install/bootstrap all dependencies:
After git repo cloned, just run following command to install/bootstrap all dependencies:

```
yarn bootstrap
```

This will install required packages in all Platform projects using Lerna
Above command install required packages in all Platform projects using Lerna.

Note: if above command fails for any reason, you can try to install required packages manually by running `yarn` inside every sub-folder with 'package.json' file

### Lerna (manual installation)

We are using [Lerna](https://github.com/lerna/lerna) for mono-repo management.
You need to run the following command from working folder where you cloned Ever git repo, which will install Lerna together with other packages:
You need to run the following command from the working folder where you cloned Ever git repo, which install Lerna together with other packages:

```
yarn
@@ -132,19 +136,19 @@ Now, after Lerna installed (locally or globally), you need to Bootstrap all depe
yarn lerna bootstrap
```

The command above will install all required packages for every sub-project of the Ever Platform.
The command above install all required packages for every sub-project of the Ever Platform.

### MongoDB

Ever platform configured to use MongoDB by default and assume you have MongoDB service running and accepting connections on default `localhost:27017`. Please see relevant section in our [documentation](https://github.com/ever-co/ever/wiki/MongoDB).
Ever platform configured to use MongoDB by default and assume you have MongoDB service running and accepting connections on the default `localhost:27017`. Please see relevant section in our [documentation](https://github.com/ever-co/ever/wiki/MongoDB).

### Platform Configuration

See relevant section in our [documentation](https://github.com/ever-co/ever/wiki/Ever-Platform-Configuration).

### Run Platform Projects

Finally, each project from Ever Platform can be started by single command from this list:
Finally, each project from Ever Platform could start by single command from this list:

```
yarn run:server # Run API server
@@ -155,7 +159,7 @@ Finally, each project from Ever Platform can be started by single command from t
yarn run:carrier # Run Carrier Mobile app
```

Note: on the first run, API Server (Backend) will create MongoDB local database `ever_development` with the following (default) Admin user
Note: on the first run, API Server (Backend) creates MongoDB local database `ever_development` with the following (default) Admin user

- email: `admin@ever.co`
- password: `admin`
@@ -164,11 +168,11 @@ You can use credentials above to login into Platform Admin App, which available

## Metrics

According to [cloc](https://github.com/AlDanial/cloc) project, Ever Platform today has more than 120K lines of TypeScript, GraphQL, HTML / CSS and other code files. You can get more details at the relevant section of our [documentation](https://github.com/ever-co/ever/wiki/Metrics).
According to [cloc](https://github.com/AlDanial/cloc) project, Ever Platform today has more than 120K lines of TypeScript, GraphQL, HTML / CSS and other code files. You can get more details in the relevant section of our [documentation](https://github.com/ever-co/ever/wiki/Metrics).

## Contribute

- Please give us :star: on Github, it **really** helps!
- Please give us :star: on Github, it **helps**!
- You are more than welcome to submit feature requests in the [separate repo](https://github.com/ever-co/feature-requests/issues)
- Pull requests are always welcome! Please base pull requests against the _develop_ branch and follow the [contributing guide](.github/CONTRIBUTING.md).

@@ -215,11 +219,11 @@ Ever Platform follows good security practices, but 100% security cannot be guara
Ever Platform is provided AS IS without any warranty. Use at your own risk!
See more details in the [LICENSE.md](LICENSE.md).

In production setup, all client-side to server-side (backend, APIs) communications should be encrypted using HTTPS/WSS/SSL (REST APIs, GraphQL endpoint, Socket.io WebSockets, etc).
In a production setup, all client-side to server-side (backend, APIs) communications should be encrypted using HTTPS/WSS/SSL (REST APIs, GraphQL endpoint, Socket.io WebSockets, etc.).

## License

This software is available under different licenses
This software is available under different licenses.

### _Ever Platform Community Edition_ License

@@ -240,9 +244,9 @@ You should have received a copy of the relevant GNU Licenses along with this pro

### _Ever Platform Enterprise_ License

Alternatively, commercial versions of the software must be used in accordance with the terms and conditions of separate written agreement between you and Ever Co. LTD.
Alternatively, commercial versions of the software must be used in accordance with the terms and conditions of a separate written agreement between you and Ever Co. LTD.

For more information about Ever® Platform Enterprise™ License please contact <mailto:ever@ever.co>.
For more information about Ever® Platform Enterprise™ License, please contact <mailto:ever@ever.co>.

#### The default Ever® Platform™ license, without a valid Ever® Platform Enterprise™ License agreement, is the Ever® Platform Community™ Edition License.

@@ -112,6 +112,7 @@
"ionicons": "^4.5.5",
"is-url": "^1.2.4",
"jquery": "^3.3.1",
"jsbarcode": "^3.11.0",
"leaflet": "^1.4.0",
"moment": "^2.24.0",
"nebular-icons": "1.1.0",
@@ -148,12 +149,12 @@
},
"devDependencies": {
"conventional-changelog-cli": "^2.0.12",
"@angular-devkit/build-angular": "^0.13.7",
"@angular-devkit/build-webpack": "^0.13.7",
"@angular-devkit/architect": "^0.13.7",
"@angular-devkit/core": "^7.3.7",
"@angular-devkit/schematics": "^7.3.7",
"@angular/cli": "^7.3.7",
"@angular-devkit/build-angular": "^0.13.8",
"@angular-devkit/build-webpack": "^0.13.8",
"@angular-devkit/architect": "^0.13.8",
"@angular-devkit/core": "^7.3.8",
"@angular-devkit/schematics": "^7.3.8",
"@angular/cli": "^7.3.8",
"@angular/compiler-cli": "^7.2.11",
"@angular/language-service": "^7.2.11",
"@babel/core": "^7.4.0",
@@ -177,7 +178,6 @@
"@types/yargs": "^13.0.0",
"babel-loader": "^8.0.5",
"codelyzer": "^4.5.0",
"conventional-changelog-cli": "^2.0.11",
"cross-env": "^5.2.0",
"dotenv": "^6.2.0",
"envalid": "^4.2.2",
@@ -198,9 +198,9 @@
"ts-node": "^8.0.2",
"tslint": "^5.12.1",
"tslint-language-service": "^0.9.9",
"yargs": "^13.1.0",
"typescript": "~3.1.6",
"webpack-dev-server": "^3.2.1",
"typescript": "~3.1.6"
"yargs": "^13.1.0"
},
"engines": {
"node": ">=10.15.0",
@@ -50,6 +50,7 @@ export class ProductsCategoryService {
) {
createProductsCategory(createInput: $productsCategory) {
id
image
name {
locale
value
@@ -86,6 +87,8 @@ export class ProductsCategoryService {
id: $id
updateInput: $productsCategory
) {
id
image
name {
locale
value
@@ -223,14 +223,18 @@

<div class="form-group row">
<!-- TODO add translate -->
<nb-checkbox class="col-sm-12" formControlName="isSharedCarrier"
>Carrier can be shared?</nb-checkbox
<nb-checkbox
class="col-sm-12"
formControlName="isSharedCarrier"
>
<nb-checkbox class="col-sm-12" formControlName="isActive">
{{
'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate
}}</nb-checkbox
>
'CARRIERS_VIEW.CARRIER_PAGE.CARRIER_CAN_BE_SHARED'
| translate
}}
</nb-checkbox>
<nb-checkbox class="col-sm-12" formControlName="isActive">
{{ 'CARRIERS_VIEW.CARRIER_PAGE.ACTIVE' | translate }}
</nb-checkbox>
</div>
</fieldset>
</div>
@@ -16,7 +16,3 @@
font-size: 1.1em;
}
}

.no-box-shadow {
box-shadow: none;
}
Oops, something went wrong.

0 comments on commit 6f5b6ad

Please sign in to comment.
You can’t perform that action at this time.