Add user orders route

app/components/order-item/template.hbs

@@ -6,8 +6,10 @@
         <p>
           z dnia {{moment-format model.createdAt 'DD-MM-YYYY HH:mm'}}<br>
           Status: {{model.status}}<br>
+          {{#unless isUser}}
           Klient: {{user.firstName}} {{user.lastName}}<br>
           Adres: {{user.addressLine1}}, {{user.addressLine2}}
+          {{/unless}}
         </p>
       {{/text.subhead}}
         {{paper-divider}}
@@ -16,11 +18,14 @@
   {{/card.title}}
   {{#paper-list}}
 
-    {{#link-to "admin.orders.edit" model.id}}
-      {{#paper-button data-test-categories-new-link raised=true primary=true}}
-        Edytuj
-      {{/paper-button}}
-    {{/link-to}}
+    {{#unless isUser}}
+      {{#link-to "admin.orders.edit" model.id}}
+        {{#paper-button data-test-categories-new-link raised=true primary=true}}
+          Edytuj
+        {{/paper-button}}
+      {{/link-to}}
+    {{/unless}}
+
     {{#paper-subheader}}Produkty{{/paper-subheader}}
     {{#each model.orderLines as |line|}}
       {{#paper-item class="md-3-line"}}

app/components/shopping-cart/component.js

@@ -106,22 +106,24 @@ export default Component.extend({
     },
 
     saveTransferOrder() {
-      let order = this.get('model.firstObject');
-      order.setProperties({
-        discount: this.get('discount'),
-        total: this.get('totalWithShipping'),
-        courier: this.get('selectedShippingOption'),
-        priceAfterDiscount: this.get('totalWithShippingAfterDiscount'),
-        status: 'Niezrealizowane',
-        paymentMethod: 'transfer'
-      });
-      order
-        .save()
-        .then(() => {
-          this.get('router').transitionTo('users.edit');
-        })
-        .catch(err => {
-        });
+      this.get('shoppingCart').saveTransferOrder();
+      // let order = this.get('model.firstObject');
+      // order.setProperties({
+      //   discount: this.get('discount'),
+      //   total: this.get('totalWithShipping'),
+      //   courier: this.get('selectedShippingOption'),
+      //   priceAfterDiscount: this.get('totalWithShippingAfterDiscount'),
+      //   status: 'Niezrealizowane',
+      //   paymentMethod: 'transfer'
+      // });
+      // order
+      //   .save()
+      //   .then(() => {
+      //     _this.set('order', _this.getCartOrder(_this.get('currentUser.user.id')));
+      //     this.get('router').transitionTo('users.edit');
+      //   })
+      //   .catch(err => {
+      //   });
     },
 
     savePayUOrder() {

app/components/shopping-cart/template.hbs

@@ -29,10 +29,8 @@
   {{/paper-radio-group}}
   <h4> Suma: {{totalWithShipping}} zł </h4>
   <h3> Do zapłaty (ze znizką): {{totalWithShippingAfterDiscount}} zł </h3>
-  {{#paper-button raised=true disabled=orderCorrect onClick=(action 'savePayUOrder')}} 
-  Przejdź do strony płatności (PayU) {{/paper-button}}
   {{#paper-button raised=true disabled=orderCorrect onClick=(action 'saveTransferOrder')}} 
   Złóz zamówienie z obowiązkiem zapłaty przelewem {{/paper-button}}
  {{else}}
-  {{!-- <p>Twój koszyk jest pusty!</p> --}}
+
 {{/if}}

app/router.js

@@ -24,6 +24,7 @@ ApplicationRouter.map(function() {
   this.route('users', function() {
     this.route('edit');
     this.route('new');
+    this.route('orders',  { path: '/:user_id/orders' });
   });
   this.route('messages', function() {
     this.route('new', { path: '/new' });
@@ -46,7 +47,6 @@ ApplicationRouter.map(function() {
       this.route('new', { path: '/:message_id/new' });
     });
   });
-  this.route('payment');
   this.route('preferred-products', { path: 'preferred-products/:user_id/' });
 });
 

app/routes/users/orders.js

@@ -0,0 +1,16 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  model(params) {
+    let userId = params.user_id;
+    return this.store.query('order', {
+      reload: true,
+      filter: {
+        notCart: {
+          userId
+        }
+      },
+      include: 'order-lines.product'
+    });
+  }
+});

app/services/shopping-cart.js

@@ -11,6 +11,7 @@ const {
 export default Service.extend({
   currentUser: service(),
   store: service(),
+  router: service(),
   inCartCount() {
     let orderLinesLength = this.get('order.firstObject.orderLines.content.length');
     if (orderLinesLength) {
@@ -52,6 +53,27 @@ export default Service.extend({
     this.set('order', this.getCartOrder(this.get('currentUser.user.id')));
   },
 
+  saveTransferOrder() {
+    let _this = this;
+    let order = this.get('order.firstObject');
+    order.setProperties({
+      discount: this.get('discount'),
+      total: this.get('totalWithShipping'),
+      courier: this.get('selectedShippingOption'),
+      priceAfterDiscount: this.get('totalWithShippingAfterDiscount'),
+      status: 'Niezrealizowane',
+      paymentMethod: 'transfer'
+    });
+    order
+      .save()
+      .then(() => {
+        _this.set('order', _this.getCartOrder(_this.get('currentUser.user.id')));
+        _this.get('router').transitionTo('users.edit');
+      })
+      .catch(err => {
+      });
+  },
+
   addOrderLine(product, count, size) {
     let _this = this;
     this.get('store').createRecord('orderLine', {

app/styles/app.scss

@@ -3,6 +3,11 @@
 @import "language-select";
 @import "product-show";
 
+.body-main {
+  margin-left: 10px;
+  margin-right: 10px
+}
+
 #user-greeting {
   font-size: 14px
 }

app/templates/admin/orders/index.hbs

@@ -1,4 +1,4 @@
-{{outlet}}
+{{!-- {{outlet}} --}}
 <h1>Zamówienia</h1>
 {{#each model as |order|}}
   {{order-item model=order}}

app/templates/application.hbs

@@ -59,11 +59,13 @@
       {{/unless}}
     {{/if}}
     {{#paper-button}}
-      {{link-to 'Wyślij wiadomość' 'messages.new'}}
+      {{link-to 'Kontakt' 'messages.new'}}
     {{/paper-button}}
     {{!-- {{language-select}} --}}
   {{/paper-toolbar-tools}}
 {{/paper-toolbar}}
 
 {{application-toast}}
-{{outlet}}
+<div class="body-main">
+  {{outlet}}
+</div>

app/templates/messages/new.hbs

@@ -1,2 +1,14 @@
-<h1>{{t 'product.newPageHeader'}}</h1>
-{{message-box model=model}}
+{{message-box model=model}}
+
+<h2>
+  Dane kontaktowe
+</h2>
+<p>
+  <b>BSC</b><br>
+  Adres: Mateusz Skrobiś<br>
+  ul. Krzywa 3/14<br>
+  43-402 Bielsko-Biała<br>
+  NIP: <b>420459131234</b><br>
+  REGON: <b>31321412423</b><br>
+  Konto bankowe: <b>  MSBC 10 2394 2913 9313 0149 4342 0234</b><br>
+</p>

app/templates/users/edit.hbs

@@ -1,15 +1,18 @@
-{{outlet}}
-{{#link-to "preference-form" model.id}}
- {{#paper-button raised=true primary=true}} Formularz preferencji {{/paper-button}}
-{{/link-to}}
+{{#unless model.isAdmin}}
+  {{#link-to "preference-form" model.id}}
+    {{#paper-button raised=true primary=true}} Formularz preferencji {{/paper-button}}
+  {{/link-to}}
+
+  {{#if model.userHasPreferences}}
+    {{#link-to 'preferred-products' model.id}}
+      {{#paper-button raised=true primary=true}} Polecane produkty {{/paper-button}}
+    {{/link-to}}
+  {{/if}}
 
-{{#if model.userHasPreferences}}
-  {{#unless model.isAdmin}}
-  {{#link-to 'preferred-products' model.id}}
-     {{#paper-button raised=true primary=true}} Polecane produkty {{/paper-button}}
+  {{#link-to 'users.orders' model.id}}
+    {{#paper-button raised=true primary=true}} Twoje zamówienia {{/paper-button}}
   {{/link-to}}
-  {{/unless}}
-{{/if}}
+{{/unless}}
 
 <h1>Twoje dane</h1>
 

app/templates/users/orders.hbs

@@ -0,0 +1,9 @@
+  {{#link-to 'users.edit'}}
+    {{#paper-button raised=true primary=true}}Wróć {{/paper-button}}
+  {{/link-to}}
+
+<h1>Twoje zamówienia</h1>
+
+{{#each model as |order|}}
+  {{order-item model=order isUser=true}}
+{{/each}}