Merge pull request #792 from crossroads/release-split-quantity

[Release] Stock v0.19.6

Author: shreyas098

app/components/quantity-chooser.js

@@ -68,6 +68,8 @@ export default Ember.Component.extend(AsyncMixin, {
 
       this.resetValue();
       this.set("displayChooseQtyOverlay", false);
+      this.sendAction("toggleShowExtendedFooterMenu");
+
     }
   }
 });

app/styles/_custom.scss

@@ -24,10 +24,13 @@ h2{
 }
 
 .split-quantity {
-  color: #fff !important;
-  font-size: 0.9rem !important;
-  @media #{$small-only} {
-    font-size: 0.72rem !important;
+  text-align: center;
+  flex-direction: column;
+  display: flex;
+  width: 100%;
+
+  #icon{
+    margin-bottom: 0.3rem;
   }
 }
 

app/templates/components/quantity-chooser.hbs

@@ -1,7 +1,7 @@
-<span {{action 'resetValueAndToggleOverlay'}} class="split-quantity">
-  <i aria-hidden="true">{{fa-icon 'clone'}}</i>
+<div {{action 'resetValueAndToggleOverlay'}} class="split-quantity">
+  <i aria-hidden="true" id="icon">{{fa-icon 'clone'}}</i>
   {{t "split_quantity.title"}}
-</span>
+</div>
 
 {{#message-box isVisible=displayChooseQtyOverlay classNames="popupOverlay split-popup"}}
   <div class="split-item-header">{{t "split_quantity.header"}}</div>

app/templates/items/detail/_tabs.hbs

@@ -37,7 +37,7 @@
     </div>
     <div class="subtab">
       <div class="icon-holder">{{fa-icon (if model.allowWebPublish 'eye' 'eye-slash') size="lg"}}</div>
-      <div class="text-holder"> {{ model.availableQuantity }} </div>
+      <div class="inventory-holder"> {{ model.availableQuantity }} </div>
     </div>
   </div>
 </div>

app/templates/items/sticky_footer.hbs

@@ -33,6 +33,11 @@
                 </li>
               {{/if}}
             {{/each}}
+            {{#if (is-greater item.availableQuantity 1)}}
+              <li class="menu ">
+                {{quantity-chooser item=item toggleShowExtendedFooterMenu=(toggle this "showExtendedFooterMenu") }}
+              </li>
+            {{/if}}
           </ul>
         </div>
       </div>
@@ -77,4 +82,5 @@
       <i>{{fa-icon 'bars'}}</i> {{t "items.action_label"}}
     </li>
   {{/if}}
-{{/sticky-footer}}
+{{/sticky-footer}}
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stock",
-  "version": "0.19.5",
+  "version": "0.19.6",
   "private": true,
   "directories": {
     "doc": "doc",

tests/acceptance/split-quantity-of-items-test.js

@@ -55,11 +55,11 @@
 //     $.mockjaxSettings.matchInRegistrationOrder = false;
 //     mocks.push(
 //       $.mockjax({
-//         url: "/api/v1/auth/current_user_profil*",
+//         url: "/api/v1/auth/current_user_profile*",
 //         responseText: data
 //       }),
 //       $.mockjax({
-//         url: "/api/v1/orders/summar*",
+//         url: "/api/v1/orders/summary*",
 //         responseText: {
 //           submitted: 14,
 //           awaiting_dispatch: 1,
@@ -109,15 +109,18 @@
 //   });
 //   mocks.push(
 //     $.mockjax({
-//       url: `/items/${updatedPkg.id}/split_ite*`,
+//       url: `/items/${updatedPkg.id}/split_item*`,
 //       type: "PUT",
 //       status: 200,
 //       responseText: updatedPkg
 //     })
 //   );
 //   visit("/");
 //   andThen(function() {
-//     visit(`/items/${updatedPkg.id}`);
+//     visit(`/items/${updatedPkg.id}/publishing`);
+//   });
+//   andThen(function() {
+//     click(".small-block-grid-4 li:last");
 //   });
 //   andThen(function() {
 //     click(".split-quantity");
@@ -129,12 +132,7 @@
 //     click(".split-item-btn");
 //   });
 //   andThen(function() {
-//     assert.equal(
-//       +Ember.$(".item-quantity")
-//         .text()
-//         .trim(),
-//       18
-//     );
+//     assert.equal($(".inventory-holder").text(), 18);
 //   });
 // });
 
@@ -163,7 +161,7 @@
 //   });
 //   mocks.push(
 //     $.mockjax({
-//       url: `/items/${updatedPkg.id}/split_ite*`,
+//       url: `/items/${updatedPkg.id}/split_item*`,
 //       type: "PUT",
 //       status: 200,
 //       responseText: updatedPkg
@@ -175,6 +173,9 @@
 //     visit(`/items/${updatedPkg.id}`);
 //   });
 //   andThen(function() {
+//     click(".small-block-grid-4 li:last");
+//   });
+//   andThen(function() {
 //     click(".split-quantity");
 //   });
 //   andThen(function() {
@@ -215,7 +216,7 @@
 //   });
 //   mocks.push(
 //     $.mockjax({
-//       url: `/items/${updatedPkg.id}/split_ite*`,
+//       url: `/items/${updatedPkg.id}/split_item*`,
 //       type: "PUT",
 //       status: 200,
 //       responseText: updatedPkg
@@ -227,6 +228,9 @@
 //     visit(`/items/${updatedPkg.id}`);
 //   });
 //   andThen(function() {
+//     click(".small-block-grid-4 li:last");
+//   });
+//   andThen(function() {
 //     click(".split-quantity");
 //   });
 //   andThen(function() {
@@ -267,7 +271,7 @@
 //   });
 //   mocks.push(
 //     $.mockjax({
-//       url: `/items/${updatedPkg.id}/split_ite*`,
+//       url: `/items/${updatedPkg.id}/split_item*`,
 //       type: "PUT",
 //       status: 200,
 //       responseText: updatedPkg
@@ -279,6 +283,9 @@
 //     visit(`/items/${updatedPkg.id}`);
 //   });
 //   andThen(function() {
+//     click(".small-block-grid-4 li:last");
+//   });
+//   andThen(function() {
 //     click(".split-quantity");
 //   });
 //   andThen(function() {
@@ -323,7 +330,7 @@
 //   });
 //   mocks.push(
 //     $.mockjax({
-//       url: `/items/${updatedPkg.id}/split_ite*`,
+//       url: `/items/${updatedPkg.id}/split_item*`,
 //       type: "PUT",
 //       status: 200,
 //       responseText: updatedPkg
@@ -334,6 +341,9 @@
 //     visit(`/items/${updatedPkg.id}`);
 //   });
 //   andThen(function() {
+//     click(".small-block-grid-4 li:last");
+//   });
+//   andThen(function() {
 //     click(".split-quantity");
 //   });
 //   andThen(function() {
@@ -378,15 +388,18 @@
 //   });
 //   mocks.push(
 //     $.mockjax({
-//       url: `/items/${updatedPkg.id}/split_ite*`,
+//       url: `/items/${updatedPkg.id}/split_item*`,
 //       type: "PUT",
 //       status: 200,
 //       responseText: updatedPkg
 //     })
 //   );
 //   visit("/");
 //   andThen(function() {
-//     visit(`/items/${updatedPkg.id}`);
+//     visit(`/items/${updatedPkg.id}/publishing`);
+//   });
+//   andThen(function() {
+//     click(".small-block-grid-4 li:last");
 //   });
 //   andThen(function() {
 //     click(".split-quantity");
@@ -398,13 +411,6 @@
 //     click(".dont-split-btn");
 //   });
 //   andThen(function() {
-//     assert.equal(
-//       +Ember.$(".item-quantity")
-//         .text()
-//         .trim(),
-//       20
-//     );
+//     assert.equal($(".inventory-holder").text(), 20);
 //   });
-// });
-
-//Commented for now and wll be updated once split button is added in action field
+// });