Skip to content
Permalink
Browse files

feat: bring some of the latest developments to Github repo

  • Loading branch information...
evereq committed Mar 22, 2019
1 parent ef24587 commit de768e2f0eabfc3fbc32c9d21aa927c61489422e
Showing with 12,514 additions and 5,015 deletions.
  1. +9 −2 .github/CONTRIBUTING.md
  2. +6 −0 .github/PULL_REQUEST_TEMPLATE.md
  3. +33 −7 README.md
  4. +21 −1 admin/website-angular/src/app/@core/data/productsCategory.service.ts
  5. +6 −27 admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.html
  6. +0 −18 admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.scss
  7. +21 −59 admin/website-angular/src/app/@shared/carrier/forms/basic-info/basic-info-form.component.ts
  8. +2 −2 admin/website-angular/src/app/@shared/carrier/forms/carrier-forms.module.ts
  9. +27 −0 admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.html
  10. +17 −0 admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.scss
  11. +149 −0 admin/website-angular/src/app/@shared/file-uploader/file-uploader.component.ts
  12. +18 −0 admin/website-angular/src/app/@shared/file-uploader/file-uploader.module.ts
  13. +7 −31 ...website-angular/src/app/@shared/product/categories/category-create/category-create.component.html
  14. +0 −18 ...website-angular/src/app/@shared/product/categories/category-create/category-create.component.scss
  15. +13 −56 ...n/website-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
  16. +7 −31 admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.html
  17. +0 −18 admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.scss
  18. +18 −60 admin/website-angular/src/app/@shared/product/categories/category-edit/category-edit.component.ts
  19. +9 −28 admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.html
  20. +0 −18 admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.scss
  21. +103 −140 admin/website-angular/src/app/@shared/product/forms/basic-info/basic-info-form.component.ts
  22. +2 −2 admin/website-angular/src/app/@shared/product/forms/product-forms.module.ts
  23. +14 −20 admin/website-angular/src/app/@shared/product/forms/products-table/products-table.component.ts
  24. +2 −2 ...ngular/src/app/@shared/render-component/customer-products-table/customer-products-table.module.ts
  25. +11 −0 ...er-component/customer-products-table/product-order-products/product-order-products.component.html
  26. +44 −0 ...nder-component/customer-products-table/product-order-products/product-order-products.component.ts
  27. +7 −0 ...render-component/customer-products-table/store-order-products/store-order-products.component.html
  28. +34 −0 ...d/render-component/customer-products-table/store-order-products/store-order-products.component.ts
  29. +1 −1 admin/website-angular/src/app/@shared/render-component/invites-requests/invites-requests.module.ts
  30. +5 −0 admin/website-angular/src/app/@shared/render-component/invites-requests/status/status.component.html
  31. +20 −0 admin/website-angular/src/app/@shared/render-component/invites-requests/status/status.component.ts
  32. +5 −0 admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.html
  33. +12 −0 admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.scss
  34. +23 −0 admin/website-angular/src/app/@shared/render-component/name-redirect/name-redirect.component.ts
  35. +8 −0 ...website-angular/src/app/@shared/render-component/price-countInput/price-countInput.component.html
  36. +27 −0 ...n/website-angular/src/app/@shared/render-component/price-countInput/price-countInput.component.ts
  37. +4 −0 admin/website-angular/src/app/@shared/render-component/product-categories/product-categories.html
  38. +1 −6 admin/website-angular/src/app/@shared/render-component/product-categories/product-categories.ts
  39. +21 −0 admin/website-angular/src/app/@shared/render-component/product-checkbox/product-checkbox.ts
  40. +3 −3 admin/website-angular/src/app/@shared/render-component/render-components.module.ts
  41. +5 −0 .../website-angular/src/app/@shared/render-component/simulation-table/sumulation-json.component.html
  42. +1 −7 admin/website-angular/src/app/@shared/render-component/simulation-table/sumulation-json.component.ts
  43. +9 −0 ...ared/render-component/store-products-table/store-product-image/store-product-image.component.html
  44. +24 −0 ...shared/render-component/store-products-table/store-product-image/store-product-image.component.ts
  45. +1 −1 ...site-angular/src/app/@shared/render-component/store-products-table/store-products-table.module.ts
  46. +86 −0 admin/website-angular/src/app/@shared/render-component/warehouse-table/elapsed/elapsed.component.ts
  47. +4 −0 admin/website-angular/src/app/@shared/render-component/warehouse-table/status/status.component.html
  48. +42 −0 admin/website-angular/src/app/@shared/render-component/warehouse-table/status/status.component.ts
  49. +5 −0 ...c/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.html
  50. +4 −0 ...c/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.scss
  51. +29 −0 ...src/app/@shared/render-component/warehouse-table/warehouse-actions/warehouse-actions.component.ts
  52. +3 −3 admin/website-angular/src/app/@shared/render-component/warehouse-table/warehouse-table.module.ts
  53. +7 −30 admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.html
  54. +0 −18 admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.scss
  55. +23 −63 admin/website-angular/src/app/@shared/user/forms/basic-info/basic-info-form.component.ts
  56. +2 −2 admin/website-angular/src/app/@shared/user/forms/user-forms.module.ts
  57. +7 −0 .../@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.html
  58. +3 −11 ...pp/@shared/warehouse-product/forms/warehouse-products-table/warehouse-products-table.component.ts
  59. +3 −2 ...rc/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.html
  60. +56 −38 .../src/app/@shared/warehouse-product/warehouse-product-create/warehouse-product-create.component.ts
  61. +6 −0 ...ular/src/app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.component.html
  62. +2 −9 ...ngular/src/app/@shared/warehouse/customer-warehouses-table/customer-warehouses-table.component.ts
  63. +8 −31 admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.html
  64. +0 −19 admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.scss
  65. +22 −54 admin/website-angular/src/app/@shared/warehouse/forms/basic-info/basic-info-form.component.ts
  66. +2 −2 admin/website-angular/src/app/@shared/warehouse/forms/warehouse-forms.module.ts
  67. +7 −30 ...shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.html
  68. +0 −18 ...shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.scss
  69. +24 −56 .../@shared/warehouse/forms/warehouse-manage-tabs/details/warehouse-manage-tabs-details.component.ts
  70. +10 −0 ...ular/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.html
  71. +6 −14 ...ngular/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.ts
  72. +10 −0 .../src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.html
  73. +1 −12 ...r/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
  74. +6 −0 admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.html
  75. +1 −8 admin/website-angular/src/app/pages/+carriers/+carrier/location/carrier-location.component.ts
  76. +1 −1 admin/website-angular/src/app/pages/+carriers/carriers.component.ts
  77. +1 −1 admin/website-angular/src/app/pages/+customers/+customer/customer.module.ts
  78. +4 −0 ...gular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.html
  79. +1 −6 ...angular/src/app/pages/+customers/+customer/ea-customer-location/ea-customer-location.component.ts
  80. +8 −0 ...customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.component.html
  81. +167 −0 .../+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.component.ts
  82. +114 −0 ...pp/pages/+customers/+customer/ea-customer-products/ea-customer-products/ea-customer-products.scss
  83. +2 −2 ...website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.component.ts
  84. +1 −1 admin/website-angular/src/app/pages/+customers/+invites/+invites-requests/invites-requests.module.ts
  85. +9 −0 admin/website-angular/src/app/pages/+customers/+invites/country-render/country-render.component.html
  86. +31 −0 admin/website-angular/src/app/pages/+customers/+invites/country-render/country-render.component.ts
  87. +1 −1 admin/website-angular/src/app/pages/+customers/+invites/invites.component.ts
  88. +1 −1 admin/website-angular/src/app/pages/+customers/+invites/invites.module.ts
  89. +2 −2 admin/website-angular/src/app/pages/+customers/customers.component.ts
  90. +2 −2 admin/website-angular/src/app/pages/+dashboard/charts-panel/charts-panel.component.ts
  91. +6 −0 ...ite-angular/src/app/pages/+dashboard/charts-panel/charts/orders-chart/orders-chart.component.html
  92. +13 −0 ...ite-angular/src/app/pages/+dashboard/charts-panel/charts/orders-chart/orders-chart.component.scss
  93. +331 −0 ...bsite-angular/src/app/pages/+dashboard/charts-panel/charts/orders-chart/orders-chart.component.ts
  94. +6 −0 ...ite-angular/src/app/pages/+dashboard/charts-panel/charts/profit-chart/profit-chart.component.html
  95. +13 −0 ...ite-angular/src/app/pages/+dashboard/charts-panel/charts/profit-chart/profit-chart.component.scss
  96. +233 −0 ...bsite-angular/src/app/pages/+dashboard/charts-panel/charts/profit-chart/profit-chart.component.ts
  97. +2 −2 admin/website-angular/src/app/pages/+dashboard/dashboard.module.ts
  98. +8 −0 admin/website-angular/src/app/pages/+maintenance-info/maintenance-info.component.html
  99. +1 −10 admin/website-angular/src/app/pages/+maintenance-info/maintenance-info.component.ts
  100. +1 −1 admin/website-angular/src/app/pages/+orders/+order/order-products/order-products.component.ts
  101. +3 −3 admin/website-angular/src/app/pages/+products/products.module.ts
  102. +24 −39 admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.html
  103. +0 −18 admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.scss
  104. +37 −91 admin/website-angular/src/app/pages/+profile/edit/basic-info/basic-info.component.ts
  105. +2 −2 admin/website-angular/src/app/pages/+profile/edit/edit.module.ts
  106. +7 −0 admin/website-angular/src/app/pages/+simulation/products/products.component.html
  107. +2 −10 admin/website-angular/src/app/pages/+simulation/products/products.component.ts
  108. +12 −0 admin/website-angular/src/app/pages/+warehouses/+warehouse-order/warehouse-order.component.html
  109. +1 −13 admin/website-angular/src/app/pages/+warehouses/+warehouse-order/warehouse-order.component.ts
  110. +1 −1 ...n/website-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.component.ts
  111. +1 −1 ...r/src/app/pages/+warehouses/+warehouse/warehouse-orders-table/warehouse-orders-table.component.ts
  112. +2 −2 admin/website-angular/src/app/pages/+warehouses/+warehouse/warehouse.component.ts
  113. +2 −2 admin/website-angular/src/app/pages/+warehouses/warehouses.component.ts
  114. +4 −0 admin/website-angular/src/app/pages/pages.component.html
  115. +1 −6 admin/website-angular/src/app/pages/pages.component.ts
  116. +65 −62 backend/api/package.json
  117. +6 −3 backend/api/src/@pyro/db-server/db-service.ts
  118. +5 −7 backend/api/src/app.module.ts
  119. +1 −0 backend/api/src/graphql/carriers/carriers.types.graphql
  120. +22 −0 backend/api/src/graphql/warehouses-orders/warehouses-orders.resolver.ts
  121. +7 −0 backend/api/src/graphql/warehouses-orders/warehouses-orders.types.graphql
  122. +9 −3 backend/api/src/services/orders/OrdersService.ts
  123. +4 −3 backend/api/src/services/users/UserCommandService.ts
  124. +29 −3 backend/api/src/services/warehouses/WarehousesCarriersService.ts
  125. +1,485 −1,158 backend/api/yarn.lock
  126. +37 −0 carrier/mobile-ionic/.env.template
  127. +7 −2 carrier/mobile-ionic/.gitignore
  128. +1 −0 carrier/mobile-ionic/README.md
  129. +188 −0 carrier/mobile-ionic/angular.json
  130. +0 −41 carrier/mobile-ionic/config/webpack.config.js
  131. +8 −0 carrier/mobile-ionic/extra-webpack.config.js
  132. +30 −0 carrier/mobile-ionic/graphql.config.json
  133. +20 −0 carrier/mobile-ionic/ngsw-config.json
  134. +102 −84 carrier/mobile-ionic/package.json
  135. +86 −0 carrier/mobile-ionic/scripts/configure.ts
  136. +87 −0 carrier/mobile-ionic/scripts/env.ts
  137. BIN carrier/mobile-ionic/src/assets/fonts/FontAwesome.otf
  138. BIN carrier/mobile-ionic/src/assets/fonts/fontawesome-webfont.eot
  139. +2,671 −0 carrier/mobile-ionic/src/assets/fonts/fontawesome-webfont.svg
  140. BIN carrier/mobile-ionic/src/assets/fonts/fontawesome-webfont.ttf
  141. BIN carrier/mobile-ionic/src/assets/fonts/fontawesome-webfont.woff
  142. BIN carrier/mobile-ionic/src/assets/fonts/fontawesome-webfont.woff2
  143. +72 −0 carrier/mobile-ionic/src/assets/i18n/bg.json
  144. +72 −0 carrier/mobile-ionic/src/assets/i18n/en.json
  145. +72 −0 carrier/mobile-ionic/src/assets/i18n/he.json
  146. +72 −0 carrier/mobile-ionic/src/assets/i18n/ru.json
  147. BIN carrier/mobile-ionic/src/assets/icon/favicon.ico
  148. BIN carrier/mobile-ionic/src/assets/icon/favicon.png
  149. BIN carrier/mobile-ionic/src/assets/icon/favicon16x16.png
  150. BIN carrier/mobile-ionic/src/assets/icon/favicon32x32.png
  151. BIN carrier/mobile-ionic/src/assets/icon/favicon48x48.png
  152. BIN carrier/mobile-ionic/src/assets/imgs/drawable-xxxhdpi-icon.png
  153. +11 −0 carrier/mobile-ionic/src/assets/imgs/ever-logo.svg
  154. BIN carrier/mobile-ionic/src/assets/imgs/logo.png
  155. +34 −0 carrier/mobile-ionic/src/environments/model.ts
  156. +131 −0 carrier/mobile-ionic/src/global.scss
  157. +28 −0 carrier/mobile-ionic/src/index.html
  158. +15 −0 carrier/mobile-ionic/src/main.ts
  159. +46 −0 carrier/mobile-ionic/src/manifest.json
  160. +75 −0 carrier/mobile-ionic/src/polyfills.ts
  161. +20 −0 carrier/mobile-ionic/src/test.ts
  162. +9 −0 carrier/mobile-ionic/src/tsconfig.app.json
  163. +10 −0 carrier/mobile-ionic/src/tsconfig.spec.json
  164. +15 −11 carrier/mobile-ionic/tsconfig.json
  165. +1,631 −483 carrier/mobile-ionic/yarn.lock
  166. +2 −0 ever.code-workspace
  167. +6 −44 merchant/tablet-ionic/src/@shared/user/forms/basic-info/basic-info-form.component.html
  168. +42 −161 merchant/tablet-ionic/src/@shared/user/forms/basic-info/basic-info-form.component.ts
  169. +1 −1 merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.html
  170. +27 −20 merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.scss
  171. +39 −8 merchant/tablet-ionic/src/@shared/user/forms/location/location-form.component.ts
  172. +3 −3 merchant/tablet-ionic/src/@shared/user/forms/user-forms.module.ts
  173. +18 −2 merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.html
  174. +8 −0 merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.scss
  175. +83 −15 merchant/tablet-ionic/src/@shared/user/mutation/user-mutation.component.ts
  176. +30 −2 merchant/tablet-ionic/src/assets/i18n/bg.json
  177. +30 −2 merchant/tablet-ionic/src/assets/i18n/en.json
  178. +30 −2 merchant/tablet-ionic/src/assets/i18n/he.json
  179. +30 −2 merchant/tablet-ionic/src/assets/i18n/ru.json
  180. +3 −3 merchant/tablet-ionic/src/components/components.module.ts
  181. +28 −0 merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.html
  182. +26 −0 merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.module.ts
  183. +60 −0 merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.scss
  184. +30 −0 merchant/tablet-ionic/src/components/confirm-delete-popup/confirm-delete-popup.ts
  185. +45 −0 merchant/tablet-ionic/src/components/file-uploader/file-uploader.component.html
  186. +24 −0 merchant/tablet-ionic/src/components/file-uploader/file-uploader.component.scss
  187. +207 −0 merchant/tablet-ionic/src/components/file-uploader/file-uploader.component.ts
  188. +20 −0 merchant/tablet-ionic/src/components/file-uploader/file-uploader.module.ts
  189. +7 −39 merchant/tablet-ionic/src/components/settings-page-components/common/common.html
  190. +1 −129 merchant/tablet-ionic/src/components/settings-page-components/common/common.ts
  191. +4 −2 merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
  192. +31 −14 merchant/tablet-ionic/src/components/settings-page-components/settings/settings.html
  193. +47 −19 merchant/tablet-ionic/src/global.scss
  194. +5 −5 ...-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.html
  195. +12 −0 ...-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/account/account-form.component.scss
  196. +1 −1 merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.scss
  197. +11 −39 .../src/pages/+carriers/add-carriers-popup/add-new-carrier/basic-info/basic-info-form.component.html
  198. +3 −163 ...ic/src/pages/+carriers/add-carriers-popup/add-new-carrier/basic-info/basic-info-form.component.ts
  199. +3 −3 ...ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/basic-info/basic-info-form.module.ts
  200. +17 −20 ...onic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.html
  201. +8 −13 ...onic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.scss
  202. +1 −1 ...-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
  203. +3 −0 merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.html
  204. +3 −0 merchant/tablet-ionic/src/pages/+carriers/carrier-deliveries-popup/carrier-deliveries-popup.html
  205. +2 −2 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.html
  206. +10 −0 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.scss
  207. +16 −3 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/account/account-form.component.ts
  208. +7 −33 ...ant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/basic-info/basic-info-form.component.html
  209. +17 −160 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/basic-info/basic-info-form.component.ts
  210. +3 −3 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/basic-info/basic-info-form.module.ts
  211. +9 −2 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.html
  212. +8 −9 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.scss
  213. +19 −13 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
  214. +14 −16 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.html
  215. +21 −9 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.scss
  216. +23 −7 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
  217. +19 −12 merchant/tablet-ionic/src/pages/+carriers/carriers.html
  218. +2 −2 merchant/tablet-ionic/src/pages/+carriers/carriers.module.ts
  219. +15 −1 merchant/tablet-ionic/src/pages/+carriers/carriers.scss
  220. +31 −13 merchant/tablet-ionic/src/pages/+carriers/carriers.ts
  221. +4 −1 merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.html
  222. +1 −1 merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.scss
  223. +9 −0 merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
  224. +3 −1 merchant/tablet-ionic/src/pages/+customers/customer-deliveries-popup/customer-deliveries-popup.html
  225. +3 −0 merchant/tablet-ionic/src/pages/+customers/customer-email-popup/customer-email-popup.html
  226. +4 −0 merchant/tablet-ionic/src/pages/+customers/customers.html
  227. +5 −2 merchant/tablet-ionic/src/pages/+customers/customers.module.ts
  228. +64 −10 merchant/tablet-ionic/src/pages/+customers/customers.ts
  229. +41 −14 merchant/tablet-ionic/src/pages/+track/track.html
  230. +14 −2 merchant/tablet-ionic/src/pages/+track/track.scss
  231. +84 −21 merchant/tablet-ionic/src/pages/+track/track.ts
  232. +3 −1 merchant/tablet-ionic/src/pages/+warehouse/all-products/all-products.component.ts
  233. +26 −17 merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.html
  234. +3 −1 ...t/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.module.ts
  235. +5 −0 merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.scss
  236. +122 −64 merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
  237. +35 −24 merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.html
  238. +3 −1 merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.module.ts
  239. +4 −0 merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.scss
  240. +57 −9 merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
  241. +26 −0 merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popu.component.scss
  242. +50 −0 ...hant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.component.html
  243. +48 −0 merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.component.ts
  244. +21 −0 merchant/tablet-ionic/src/pages/+warehouse/product-pictures-popup/product-images-popup.module.ts
  245. +1 −2 merchant/tablet-ionic/src/pages/+warehouse/relevant-oders/relevant-orders.component.html
  246. +2 −2 merchant/tablet-ionic/src/pages/+warehouse/warehouse.ts
  247. +2 −1 merchant/tablet-ionic/src/services/orders.service.ts
  248. +21 −0 merchant/tablet-ionic/src/services/warehouse-orders.service.ts
  249. +9 −0 merchant/tablet-ionic/src/services/warehouses.service.ts
  250. +4 −0 shared/core-angular/routers/warehouse-carriers-router.service.ts
  251. +10 −0 shared/core/entities/Carrier.ts
  252. +1 −0 shared/core/routers/IWarehouseCarriersRouter.ts
  253. +7 −1 shop/mobile-ionic/.gitignore
  254. +82 −81 shop/mobile-ionic/package.json
  255. +1 −2 shop/mobile-ionic/src/app/pages/+products/products-view/list-view/list-view.component.html
  256. +1,191 −697 shop/mobile-ionic/yarn.lock
  257. +1 −1 shop/website-angular/.env.template
  258. +0 −1 shop/website-angular/src/app/+products/products.component.html
  259. +0 −1 shop/website-angular/src/app/+products/views/list/list-view.component.html
  260. +0 −1 shop/website-angular/src/app/toolbar/toolbar.component.html
  261. +0 −1 shop/website-angular/src/app/view-type/view-type.component.html
  262. +3 −0 shop/website-angular/src/assets/i18n/bg.json
  263. +3 −0 shop/website-angular/src/assets/i18n/en.json
  264. +3 −0 shop/website-angular/src/assets/i18n/he.json
  265. +3 −0 shop/website-angular/src/assets/i18n/ru.json
  266. +0 −1 shop/website-angular/src/modules/material-extensions/search/mat-search.component.html
@@ -8,10 +8,17 @@ If you're changing the structure of the repository please create an issue first.

## Submitting bug reports

Make sure you are on latest changes.
Make sure you are on latest changes.
If you can, please provide more information about your environment such as browser, operating system, node version, and yarn version.

## Feature requests
## Feature requests

You are more than welcome to submit future requests here https://github.com/ever-co/feature-requests/issues

## Legal

This is an open source project.
Contributions you make to this public Ever Platform repository are completely voluntary.
When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment,
you expressly waive any future pay claims against the Ever Co. LTD related to your contribution, and you acknowledge that this does not create an obligation on the part of the Ever Co. LTD of any kind.
Furthermore, your contributing to this project does not create an employer-employee relationship between the Ever Co. LTD and the contributor.
@@ -0,0 +1,6 @@
- [ ] Have you followed the [contributing guidelines](https://github.com/ever-co/ever/blob/master/.github/CONTRIBUTING.md)?
- [ ] Have you explained what your changes do, and why they add value?

**Please note: we will close your PR without comment if you do not check the boxes above and provide ALL requested information.**

---
@@ -6,13 +6,13 @@

[Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform build with [TypeScript](http://www.typescriptlang.org).

Out-of-the-box Ever Platform provides everything required to quickly build, manage and expand Multi-Store (Multi-Vendor Marketplace) or Single-Store **On-Demand** Commerce Solutions with customized e-commerce Websites (shops), Mobile ordering apps (Hybrid and PWA), Carrier (Driver) apps, Merchant apps and Admin interface website.
Out-of-the-box Ever® Platform provides everything required to quickly build, manage and expand Multi-Store (Multi-Vendor Marketplace) or Single-Store **On-Demand** Commerce Solutions with customized e-commerce Websites (shops), Mobile ordering apps (Hybrid and PWA), Carrier (Driver) apps, Merchant apps and Admin interface website.

![overview](https://docs.ever.co/docs/assets/overview.jpg)

### Disclaimer

_A word of caution_: We are in α (alpha), i.e. Ever Platform is very much under development (work in progress, WIP).
_A word of caution_: We are in α (alpha), i.e. Ever® Platform is very much under development (work in progress, WIP).
Expect _lots_ of changes and some :bug: and please be nice! :stuck_out_tongue_winking_eye:

## Features
@@ -190,6 +190,31 @@ Note: on the first run, API Server (Backend) will create MongoDB local database

You can use credentials above to login into Platform Admin App, which available locally at http://localhost:4200 (by default)

## Metrics

See below aproximate source code metrics for Ever Platform using [cloc](https://github.com/AlDanial/cloc) project.

```
github.com/AlDanial/cloc v 1.80 T=5.12 s (385.5 files/s, 27882.0 lines/s)
-------------------------------------------------------------------------------
Language files blank comment code
-------------------------------------------------------------------------------
TypeScript 1145 10151 4065 73840
HTML 319 1005 135 15917
Sass 298 1969 339 12800
JSON 39 13 0 8258
CSS 95 1196 665 5650
JavaScript 50 8 87 3257
Markdown 6 554 1 1426
GraphQL 21 269 49 1091
XML 1 0 0 11
-------------------------------------------------------------------------------
SUM: 1974 15165 5341 122250
-------------------------------------------------------------------------------
```

Note: you can get latest metrics using `yarn count` from the root of mono-repo.

## Contribute

- Please give us :star: on Github, it **really** helps!
@@ -253,7 +278,7 @@ Different parts of the Platform are made available under the terms of the separa
- Pyro shared modules under [MIT License](https://opensource.org/licenses/MIT)
- Other shared modules under [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.txt)

If you decide to choose the Ever Platform Community Edition License, you must comply with the following terms:
If you decide to choose the Ever® Platform Community Edition License, you must comply with the following terms:

This program is free software: you can redistribute it and/or modify it under the terms of the corresponding licenses described in the LICENSE.md files located in software sub-folders and under the terms of licenses described in individual files.

@@ -265,19 +290,20 @@ You should have received a copy of the relevant GNU Licenses along with this pro

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.

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.
#### The default Ever® Platform license, without a valid Ever® Platform Enterprise License agreement, is the Ever® Platform Community Edition License.

#### Please see [LICENSE.md](LICENSE.md) for more information on licenses.

[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fever-co%2Fever.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fever-co%2Fever?ref=badge_large)

## Trademarks

**Ever**® is a registered trademark of [Ever Co. LTD](https://ever.co).
**Ever**® is a registered trademark of [Ever Co. LTD](https://ever.co).
**Ever® Platform™**, **Ever® Platform Community™** and **Ever® Platform Enterprise™** are all trademarks of [Ever Co. LTD](https://ever.co).

The trademark may only be used with the written permission of Ever Co. LTD. and may not be used to promote or otherwise market competitive products or services.
The trademarks may only be used with the written permission of Ever Co. LTD. and may not be used to promote or otherwise market competitive products or services.

All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.

@@ -5,10 +5,15 @@ import { map, share } from 'rxjs/operators';
import gql from 'graphql-tag';
import { IProductsCategoryCreateObject } from '@modules/server.common/interfaces/IProductsCategory';
import ProductsCategory from '@modules/server.common/entities/ProductsCategory';
import { getDummyImage } from '@modules/server.common/utils';
import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';

@Injectable()
export class ProductsCategoryService {
constructor(private readonly apollo: Apollo) {}
constructor(
private readonly apollo: Apollo,
private readonly productLocalesService: ProductLocalesService
) {}

getCategories(): Observable<ProductsCategory[]> {
return this.apollo
@@ -36,6 +41,7 @@ export class ProductsCategoryService {
create(
productsCategory: IProductsCategoryCreateObject
): Observable<ProductsCategory> {
this.getDefaultImage(productsCategory);
return this.apollo
.mutate<{ productsCategory: IProductsCategoryCreateObject }>({
mutation: gql`
@@ -65,6 +71,7 @@ export class ProductsCategoryService {
id: string,
productsCategory: IProductsCategoryCreateObject
): Observable<ProductsCategory> {
this.getDefaultImage(productsCategory);
return this.apollo
.mutate<{
id: string;
@@ -110,4 +117,17 @@ export class ProductsCategoryService {
variables: { ids }
});
}

private getDefaultImage(data: IProductsCategoryCreateObject) {
if (!data.image) {
data.image = getDummyImage(
300,
300,
this.productLocalesService
.getTranslate(data.name)
.charAt(0)
.toUpperCase()
);
}
}
}
@@ -149,33 +149,12 @@
</label>

<div class="col-sm-10">
<div class="row upload-img">
<input
[hidden]="true"
(change)="imageUrlChanged()"
#fileInput
type="file"
id="fileInput"
ng2FileSelect
[uploader]="uploader"
/>

<input
type="text"
class="form-control col-10"
placeholder="{{
'CARRIERS_VIEW.EDIT.PHOTO_URL' | translate
}} (optional)"
formControlName="logo"
/>

<button
(click)="fileInput.click()"
class="btn btn-primary btn-rectangle col-2"
>
{{ 'BROWSE' | translate }}
</button>
</div>
<e-cu-file-uploader
[placeholder]="uploaderPlaceholder"
[name]="username?.value"
[fileUrl]="logo?.value"
(uploadedImgUrl)="logo.setValue($event)"
></e-cu-file-uploader>

<div *ngIf="isLogoValid" class="alert alert-danger">
{{
@@ -1,21 +1,3 @@
.row.upload-img {
padding-left: 14px;
padding-right: 16px;

button {
padding: 0 !important;
border-radius: 0px;
border-top-right-radius: 0.375rem;
border-bottom-right-radius: 0.375rem;
}

input {
border-radius: 0px !important;
border-top-left-radius: 0.375rem !important;
border-bottom-left-radius: 0.375rem !important;
}
}

.preview-img {
padding-left: 14px;
padding-right: 16px;
@@ -3,7 +3,8 @@ import {
Input,
ViewChild,
ElementRef,
AfterViewInit
AfterViewInit,
OnInit
} from '@angular/core';
import {
AbstractControl,
@@ -15,9 +16,9 @@ import {
import { ICarrierCreateObject } from '@modules/server.common/interfaces/ICarrier';
import * as _ from 'lodash';
import { FormHelpers } from '../../../forms/helpers';
import { FileUploader, FileUploaderOptions } from 'ng2-file-upload';
import { environment } from 'environments/environment';
import * as isUrl from 'is-url';
import { TranslateService } from '@ngx-translate/core';
import { first } from 'rxjs/operators';

export type CarrierBasicInfo = Pick<
ICarrierCreateObject,
@@ -35,21 +36,19 @@ export type CarrierBasicInfo = Pick<
templateUrl: 'basic-info-form.component.html',
styleUrls: ['basic-info-form.component.scss']
})
export class BasicInfoFormComponent implements AfterViewInit {
export class BasicInfoFormComponent implements OnInit, AfterViewInit {
@ViewChild('logoImagePreview')
logoImagePreview: ElementRef;

uploader: FileUploader;
uploaderPlaceholder: string;

@Input()
readonly form: FormGroup;

@Input()
readonly password?: AbstractControl;

constructor() {
this.uploaderConfig();
}
constructor(private translateService: TranslateService) {}

get isActive() {
return this.form.get('isActive');
@@ -169,6 +168,10 @@ export class BasicInfoFormComponent implements AfterViewInit {
return new FormControl('', [Validators.required]);
}

ngOnInit(): void {
this.getuploaderPlaceholderText();
}

ngAfterViewInit() {
this._setupCarrierLogoUrlValidation();
}
@@ -195,23 +198,20 @@ export class BasicInfoFormComponent implements AfterViewInit {
this.password.setValue(value);
}

imageUrlChanged() {
this.uploader.queue[0].upload();

this.uploader.onSuccessItem = (
item: any,
response: string,
status: number
) => {
const data = JSON.parse(response);
this.logo.setValue(data.url);
};
}

deleteImg() {
this.logo.setValue('');
}

async getuploaderPlaceholderText() {
this.uploaderPlaceholder = await this.translateService
.get('CARRIERS_VIEW.EDIT.PHOTO_URL')
.pipe(first())
.toPromise();

// TODO add translate
this.uploaderPlaceholder += ' (optional)';
}

private static phoneNumberRegex = /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9x]*$/;

private _setupCarrierLogoUrlValidation() {
@@ -227,42 +227,4 @@ export class BasicInfoFormComponent implements AfterViewInit {
}
};
}

private uploaderConfig() {
const uploaderOptions: FileUploaderOptions = {
url: environment.API_FILE_UPLOAD_URL,

isHTML5: true,
removeAfterUpload: true,
headers: [
{
name: 'X-Requested-With',
value: 'XMLHttpRequest'
}
]
};
this.uploader = new FileUploader(uploaderOptions);

this.uploader.onBuildItemForm = (
fileItem: any,
form: FormData
): any => {
form.append('upload_preset', 'everbie-products-images');

let tags = 'myphotoalbum';

if (this.username.value) {
form.append('context', `photo=${this.username.value}`);
tags = `myphotoalbum,${this.username.value}`;
}

form.append('folder', 'angular_sample');
form.append('tags', tags);
form.append('file', fileItem);

fileItem.withCredentials = false;

return { fileItem, form };
};
}
}
@@ -3,14 +3,14 @@ import { TranslateModule } from '@ngx-translate/core';
import { FormWizardModule } from 'angular2-wizard';
import { BasicInfoFormComponent } from './basic-info';
import { ThemeModule } from '../../../@theme';
import { FileUploadModule } from 'ng2-file-upload';
import { FileUploaderModule } from 'app/@shared/file-uploader/file-uploader.module';

@NgModule({
imports: [
ThemeModule,
FormWizardModule,
TranslateModule.forChild(),
FileUploadModule
FileUploaderModule
],
exports: [BasicInfoFormComponent],
declarations: [BasicInfoFormComponent]
Oops, something went wrong.

0 comments on commit de768e2

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