Skip to content

Commit

Permalink
[Marketplace] Set order(s) to a specific status (#2613)
Browse files Browse the repository at this point in the history
* more props passed to wrapper

* fixes for email table

* update Email table to use ReactTable

* email table convert to ReactTable

* Bunyan and Loggly updates (#2425)

* switch to official Loggly lib for Node and write new Bunyan connector for it

* update bunyan to 2.0.0

* add REACTION_LOG_FORMAT config option

* add extra comments about log formatting options

* refactor default admin user creation (#2453)

* update memory usage in CircleCI build (#2462)

* finished implementing design

* Navbar hover issue (#2451)

* added default hover style for languages and currencies class #2444

* added accounts css class to div in mainDropdownContainer #2444

* added hover styles for account class #2444

* added hover style for notification class #2444

* set css property overflow on horizontal to hidden (#2458)

* [WIP] 2452 fix on UI icon toolbar (#2460)

2452 fix on UI icon toolbar

* [WIP] 2356 fix on tag menu-sidebar glitch (#2472)

Fix on tag menu-sidebar glitch

* format price string for invoice details

* update media gallery new / deleted image indicators (#2469)

* add new status for mediaGalleryIndicator

* i18n translations for tooltips

* status-badge styles for media gallery

* update media gallery image new / deleted indicator

* style updates

* lint fix

* Remove random regex checks on names. Fixes #2461 (#2471)

* remove older Blaze based launchdock plugin (#2467)

* 2459 router range error fix (#2476)

* simple fix

* fix typo & linting

* fix linting issues

* custom pagination component for React-Table

* update Avalara to use ReactTable

* add spacing below tables

* 2422 Fix on email invite link leading to blank screen (#2437)

* imported LoginFormValidation to forgotContainer

* imported LoginFormValidation to passwordOverlayContainer

* added setTimeout function to delay rendering

* wrap component in translations (#2434)

* removed setTimeouts from updatePassword.js

* added spinner before mounting the component

* replaced setTimeout with life-cycle hook(componentWillRecieveProps) #2422

* imported LoginFormValidation to prevent console error

* Update current user's name on Navbar and profile page when address is added. (#2455)

* Update current user's name and profile when address is added

* Update user's name when address is updated

* Get correct admin user's name from env variables

* add invoice actions

* Updated dependencies (#2463)

* Move babelrc into package.json

* Updated dependencies

* Define missing options variable

* remove leftover console.logs

* lint fixes

* lint fix

* query prop validation

* pagination updates

* Revert minifier to abernix fork (#2486)

* Use abernix:standard-minifier-js

Replace standard-minifier-js with
abernix:[email protected]

This should be compatible with current 1.5 tools, and is what we were
using before 1.5, because of the faster compilation and reduced memory
footprint.  Restoring in an attempt to diagnose build issues related to
memory.

* updated meteor package versions

* componetize pagination

* Release 1.3.0 (#2417)

## Features

-   **Meteor 1.5 (#2371)**
-   **Order fulfillment UI updates (#2400)**
-   **React Router updated (#2123)**
-   **React Navbar (and deprecated Blaze navbar) (#2306)**
-   **Re-introduce icon toolbar as shortcutBar (#2261)**
-   **React unit testing example (#2170)**
-   **[WIP] [Style guide](https://styleguide.reactioncommerce.com)**

## Changes / Fixes
- __Update current user's name on Navbar and profile page when address is added. (#2455)__
- __Fix #2422 on email invite link leading to blank screen (#2437)__
- __Fix #2459 router range error fix (#2476)__
- __Remove older Blaze based launchdock plugin (#2467)__
- __Remove random regex checks on names. Fixes #2461 (#2471)__
- __Update media gallery new / deleted image indicators (#2469)__
- __Fix #2356 on tag menu-sidebar glitch (#2472)__
- __Fix #2452 on UI icon toolbar (#2460)__
- __set css property overflow on horizontal to hidden (#2458)__
- __Navbar hover issue (#2451)__
- __update memory usage in CircleCI build (#2462)__
- __refactor default admin user creation (#2453)__
- __Bunyan and Loggly updates (#2425)__
- __Updated chai package__
- __add missing "orders not found" text (#2424)__
- __Add closeOnClick option to DropDownMenu component (#2418)__
-   **Fixed console error when dragging product images (#2443)**
-   **Remove unmaintained Browserstack acceptance tests (#2430)**
-   **Add css style to differentiate read from unread notifications (#2442)**
-   **Added module aliases @reactioncommerce/reaction-ui (#2436)**
-   **Switch to Reaction’s new fork of Nodemailer (#2427)**
-   **Admin should be able to invite a user with the same name (#2386)**
-   **Updated yarn.lock and removed npm-shrinkwrap.json**
-   **use route permissions in register.js files (#2388)**
-   **Updated, refreshed order/fulfillment UI (#2400)**
-   **Change line width to match GH PR review width (#2407)**
-   **Fix Improper Cart Merge (#2387)**
-   **Implement missing router functions (#2393)**
-   **Correct the way we record tax overrides**
-   **CollectionFS  cfs:tempstore and cfs:worker to Fix concurrency issues with GridFS uploads (#2096)**
-   **Fix typo in inventory test description (#2364)**
-   **Added Nigerian Naira to currency list in (#2366)**
-   **Fix git tagging on CircleCI 2.0 (#2362)**
-   **Adding the license description with link on README (#2365)**
-   **Better handling for unique routes for React Router (#2327)**
-   **Don't throwback a step if tax fails**
-   **Updated UI colors for styleguide (#2339)**
-   **Add loading component to Fix error (#2340)**
-   **Allow a MAIL_URL string without auth (#2330)**
-   **Defer Fixture load until the default shop is loaded (#2329)**
-   **Fix conditional in Circle deploy script (#2338)**
-   **Fix refunds not showing (#2317)**
-   **Add Verification Url to Welcome Email (#2216)**
-   **CircleCI 2.0 and docker base update (#2334)**
-   **i18n translation updates (#2302 #2420)**
-   **Change customer notification message when order is processed. (#2290)**
-   **Allow loader to show when one is passed in and defined BUGFIX (#2303)**
-   **Add the Vietnamese Dong as a supported currency (#2248)**
-   **Updated shipping / payment error messages in checkout (#2271)**
-   **Fix #2203 Long Strings Handling in Product Option Title (#2266)**
-   **Simplify core layout component (#2257)**
-   **Fix multiple refunds for stripe (#2260)**

* Fix error when inviting already invited user (#2433)

* Refactor invite function to send invites only to non invited members

* Refactor error message to show status code

* Change the error message to use inline Alert

* Clear input fields when there is error

* Use Reaction's blaze inlineAlerts for error message

* Eliminate console error on inviteShopMember call

* move emailconfig css to LESS file

* Updated timeout time. (#2492)

* Updated timeout time.

* don't autohide

This should not autohide, the error should display until a user resubmits with a new email address. If the error is hidden, they might not see it right away and miss it. This is a blocking error for this field so it should stay until resolved.

* style updates for sortableTable

* update translations

* custom full-table filter for ReactTable

* Fixed product images not displaying on order completed page (#2490)

* custom full table filter

* new match-sorter package for custom filter

* Fix hard refresh on clicking tag link on product detail page (#2489)

* Provide tag component with missing click function

* Remove hard refresh on PDP link in Grid settings

* Remove redundant risul:moment-timezone (#2491)

* add translations for default table text

* translations

* kill translations for the moment, something is acting up

* add catch for error when no data is available

* List view toggle

* Use sortableTable to display list

* finish order line item popover functionality

* First styling iteration

* Add table classname

* allow only users with the orders and dashboard/orders permission to view the popover

* Merge with marketplace

* Styling second iteration

* Rewrite orders.js into React; Remve filters on orders

* Add onto checking capabilty

* Buyah

* Replace span toggles with buttons

* Styling iteration

* Toggle bulk order actions bar on checkbox select

* Select all checkbox

* Change import to match style guide

* Handle multiple select of orders (part 1)

* Toggle ReactTable header visibility on order(s) select

* Handle multiple select of orders (part 2)

* Handle multiple select of orders: fully working

* Check all

* Massive refactor

* few style additions

* Hide columns on screen size change

* Checkbox multi select tweak

* Select all orders on 'Check All' even if one was already selected

* Vertically align bulk actions bar contents

* Corrections from review

* Center align checkbox/avatar with parent check-all box

* Center column data

* Change checkbox class name

* Change checkbox class name

* Change checked icon to font-awesome check

* Add className prop to badge component

* Allow for selected rows to be styled in React Table

* Style selected order rows

* Styling merge with checkboxes

* Pagination reorder

* Match padding between top and bottom in bulk order actions bar

* Toggle, control buttons

* Remove border from selected orders

* Add i18n for bulk order actiobs bar elements

* Update badge snapshot to include provided className

* Change sortable bar color

* Toggle buttons within container and pagination margin increse

* Remove old pagination

* Checkboxes add

* Fix collapsable column problem

* Center align row data

* Bulk order actions bar styling based on new order table styles (part 1)

* Fix row size change

* Bulk order actions bar styling based on new order table styles (part 2)

* Fix bithound issues

* Add @reactioncommerce/reaction-collections

* Fix bithound issues

* Remove line items code from merged in PR

* Fix minor issues as commented on PR

* Use assign as opposed to extend

* Fix button new/prrocessing change

* Make button unresizable

* Use less files to style table

* Remove hardcoded selected row background color, give selected row a className and style in stylesheet

* Refactor code

* Fix lint issues

* Fix table moving up and down

* Modify list component to receive className, change undefined data to props

* Bulk order actions button list onClick

* Toggle background color and icons on list items click

* Further styling of shipping list

* Remove hardcoded styles in the table

* remove order actions files not being used anymore(might be reason for pagination error)

* Prefer this.props over long destructuring statement

* Select Orders from main orders screen (#2549)

* Toggle bulk order actions bar on checkbox select

* Handle multiple select of orders (part 1)

* Toggle ReactTable header visibility on order(s) select

* Handle multiple select of orders (part 2)

* Handle multiple select of orders: fully working

* Select all orders on 'Check All' even if one was already selected

* Vertically align bulk actions bar contents

* Center align checkbox/avatar with parent check-all box

* Change checkbox class name

* Change checkbox class name

* Change checked icon to font-awesome check

* Add className prop to badge component

* Allow for selected rows to be styled in React Table

* Style selected order rows

* Match padding between top and bottom in bulk order actions bar

* Remove border from selected orders

* Add i18n for bulk order actiobs bar elements

* Update badge snapshot to include provided className

* Bulk order actions bar styling based on new order table styles (part 1)

* Bulk order actions bar styling based on new order table styles (part 2)

* Fix bithound issues

* Fix bithound issues

* Remove hardcoded selected row background color, give selected row a className and style in stylesheet

* Remove hardcoded styles in the table

* Prefer this.props over long destructuring statement

* Final styling of shipping list

* Final styling of shipping list

* Iteration 1 of order select and set status

* First working instance for new Orders detail view

* Refactor code

* Wrap up on styling

* Fix broken bulk order select

* Fix header padding

* Iteration 2 of order select and set status

* Fix toggle of shipping flow list, rename labels

* Create back end methods for labeled and picked shipping statuses, refine front end methods to reflect this

* Implement skipping flow statuses

* Add event to order history showing bulk action state setting

* Remove bulk order bar on orders detail view

* Fix lint error

* Fix moving table

* Break down shippingStatus function into smaller functions

* Reorder shipping flow

* Set bulk selected orders to a specific state (iteration 1)

* Remove unnecessary ordersContainer

* Refactor repeated code into common function that's re-usable

* Remove unnecessary method binding

* Set multiple orders to labeled state

* Provide optional shipped param to shipmentShipped method

* Set multiple orders to shipped state

* Move bulk actions bar code to it's own component

* Add allowOutsideClick and cancelButtonText as alert options

* Document and add comments for shipping methods

* Use reaction color variables over hardcoded colors

* Oops

* Delay success modal until all orders' state has been set

* Fix interchanged states

* Translation (part 1)

* Correct i18nKeyLabel typo

* Translation (part 2), extract alerts to common function that's reusable

* Standardise case in translation key

* Fix typo in comment

* Remove testing of truthiness of order object, prefer 'check' of object

* Move shipping string states to constant

* Remove unneeded call to shop for currency display

* Standardise naming of shipping flow steps

* Rethink wording of alerts

* Use workflow object to store/determine shipping status (part 1)

* Remove shipping booleans from shipping schema

* Rewrite shipping status methods to fit use of workflow status (part 1)

* Rewrite shipping status methods to fit use of workflow status (part 2)

* Tests for orders/shipmentPicked and orders/shipmentLabeled; tweak tests for orders/shipmentPacked, orders/shipmentShipped and orders/shipmentDelivered

* Import order

* Remove unnecessary closing brace

* Render spinner while waiting for action on bulk orders

* UI consistency when selecting bulk actions

* Show bottom pagination on bulk orders select

* Implement regression alert

* Refine regression alert

* Commenting shipping state methods

* remove deprecated use of number as first argument of Meteor.Error

* Switch order of shipping flow checks

* Tweak 'picked' status regression method

* Fix line length

* Rename variable

* Add back missing 'Processing' translation

* Fix random opening of status bar

* Use props as passed down from parent container

* Turn all avatars to checkboxes on order select

* Add printing step to flow list

* Enable Capture button

* Set loading state of captore button to false on error

* Rename file names

* Fix error on payment approving
  • Loading branch information
Njeri Kieha authored and spencern committed Aug 24, 2017
1 parent 8b67825 commit ab498c7
Show file tree
Hide file tree
Showing 19 changed files with 1,220 additions and 650 deletions.
182 changes: 182 additions & 0 deletions imports/plugins/core/orders/client/components/orderBulkActionsBar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Translation, Checkbox, Button, Icon, List, ListItem } from "@reactioncommerce/reaction-ui";

class OrderBulkActionsBar extends Component {
static propTypes = {
handleBulkPaymentCapture: PropTypes.func,
isLoading: PropTypes.object,
multipleSelect: PropTypes.bool,
orders: PropTypes.array,
renderFlowList: PropTypes.bool,
selectAllOrders: PropTypes.func,
selectedItems: PropTypes.array,
setShippingStatus: PropTypes.func,
shipping: PropTypes.object,
toggleShippingFlowList: PropTypes.func
};

constructor() {
super();
this.state = {
printed: false
};
}

renderLoadingSpinner(status) {
return this.props.isLoading[status] ?
<Icon className="bulk-actions-icons-select" icon="fa fa-spinner fa-pulse" />
:
<Icon className="bulk-actions-icons-select" icon="fa fa-circle-o"/>;
}

onClick = (event, value) => {
this.setState({
[value]: true
});
}

renderShippingFLowList() {
if (this.props.renderFlowList) {
return (
<List className="shipping-flow-list">
<ListItem
label="Print Invoice and Pick Sheet"
i18nKeyLabel="order.printInvoiceAndPickSheet"
value="printed"
onClick={this.onClick}
listItemClassName={this.state.printed ? "selected" : ""}
>
{this.state.printed ?
<div>
<Icon className="bulk-actions-icons" icon="fa fa-print"/>
<Icon className="bulk-actions-icons-select" icon="fa fa-check"/>
</div>
:
<Icon className="bulk-actions-icons-select" icon="fa fa-print"/>
}
</ListItem>
<ListItem
label="Picked"
i18nKeyLabel="order.picked"
value="picked"
onClick={this.handleListItemClick}
listItemClassName={this.props.shipping.picked ? "selected" : ""}
>
{this.props.shipping.picked ?
<div>
<Icon className="bulk-actions-icons" icon="fa fa-print"/>
<Icon className="bulk-actions-icons-select" icon="fa fa-check"/>
</div>
:
this.renderLoadingSpinner("picked")
}
</ListItem>
<ListItem
label="Packed"
i18nKeyLabel="order.packed"
value="packed"
onClick={this.handleListItemClick}
listItemClassName={this.props.shipping.packed ? "selected" : ""}
>
{this.props.shipping.packed ?
<Icon className="bulk-actions-icons-select" icon="fa fa-check"/>
:
this.renderLoadingSpinner("packed")
}
</ListItem>
<ListItem
label={this.props.shipping.labeled ? "Generate Label" : "Labeled"}
i18nKeyLabel={this.props.shipping.labeled ? "order.generateLabel" : "order.labeled"}
value="labeled"
onClick={this.handleListItemClick}
listItemClassName={this.props.shipping.labeled ? "selected" : ""}
>
{this.props.shipping.labeled ?
<div>
<Icon className="bulk-actions-icons" icon="fa fa-print"/>
<Icon className="bulk-actions-icons-select" icon="fa fa-check"/>
</div>
:
this.renderLoadingSpinner("labeled")
}
</ListItem>
<ListItem
label="Shipped"
i18nKeyLabel="order.shipped"
value="shipped"
onClick={this.handleListItemClick}
listItemClassName={this.props.shipping.shipped ? "selected" : ""}
>
{this.props.shipping.shipped ?
<div>
<Icon className="bulk-actions-icons" icon="fa fa-paper-plane-o" />
<Icon className="bulk-actions-icons-select" icon="fa fa-check"/>
</div>
:
this.renderLoadingSpinner("shipped")
}
</ListItem>
</List>
);
}
}

handleListItemClick = (event, value) => {
if (this.props.setShippingStatus) {
this.props.setShippingStatus(value, this.props.selectedItems);
}
}

handlePaymentClick = () => {
if (this.props.handleBulkPaymentCapture) {
this.props.handleBulkPaymentCapture(this.props.selectedItems);
}
}

render() {
const { orders, multipleSelect, selectedItems, selectAllOrders } = this.props;

if (selectedItems.length > 0) {
return (
<div className="bulk-order-actions-bar">
<Checkbox
className="checkbox-large orders-checkbox"
checked={selectedItems.length === orders.length || multipleSelect}
name="orders-checkbox"
onChange={() => selectAllOrders(orders, (selectedItems.length === orders.length || multipleSelect))}
/>
<Translation
className="selected-orders"
defaultValue={`${selectedItems.length} Selected`}
i18nKey={`${selectedItems.length} order.selected`}
/>
<Button
status="success"
bezelStyle="solid"
className="capture-orders-button"
label={this.props.isLoading.capturePayment ? "Capturing" : "Capture"}
i18nKeyLabel={this.props.isLoading.capturePayment ? "order.capturing" : "order.capture"}
icon={this.props.isLoading.capturePayment ? "fa fa-spinner fa-pulse" : ""}
iconAfter={true}
onClick={this.handlePaymentClick}
/>
<Button
status="default"
bezelStyle="solid"
className="bulk-actions-button"
label="Bulk Actions"
i18nKeyLabel="order.bulkActions"
icon="fa fa-chevron-down"
iconAfter={true}
onClick={this.props.toggleShippingFlowList}
/>
{this.renderShippingFLowList()}
</div>
);
}
return null;
}
}

export default OrderBulkActionsBar;
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,22 @@ import PropTypes from "prop-types";
import { Icon, Translation } from "@reactioncommerce/reaction-ui";
import OrderTable from "./orderTable";

class OrdersList extends Component {
class OrderDashboard extends Component {
static propTypes = {
displayMedia: PropTypes.func,
handleBulkPaymentCapture: PropTypes.func,
handleClick: PropTypes.func,
handleSelect: PropTypes.func,
isLoading: PropTypes.object,
multipleSelect: PropTypes.bool,
orders: PropTypes.array,
renderFlowList: PropTypes.bool,
selectAllOrders: PropTypes.func,
selectedItems: PropTypes.array
selectedItems: PropTypes.array,
setShippingStatus: PropTypes.func,
shipping: PropTypes.object,
toggleShippingFlowList: PropTypes.func

}

state = {
Expand Down Expand Up @@ -66,6 +73,12 @@ class OrdersList extends Component {
selectAllOrders={this.props.selectAllOrders}
displayMedia={this.props.displayMedia}
isOpen={this.state.openList}
shipping={this.props.shipping}
setShippingStatus={this.props.setShippingStatus}
isLoading={this.props.isLoading}
renderFlowList={this.props.renderFlowList}
toggleShippingFlowList={this.props.toggleShippingFlowList}
handleBulkPaymentCapture={this.props.handleBulkPaymentCapture}
/>
</div>
</div>
Expand All @@ -83,4 +96,4 @@ class OrdersList extends Component {
}
}

export default OrdersList;
export default OrderDashboard;
90 changes: 29 additions & 61 deletions imports/plugins/core/orders/client/components/orderTable.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { Orders } from "/lib/collections";
import { SortableTable, Loading, Checkbox } from "@reactioncommerce/reaction-ui";
import OrderTableColumn from "./orderTableColumn";

import classnames from "classnames/dedupe";
import Avatar from "react-avatar";
import moment from "moment";
import classnames from "classnames/dedupe";
import { Badge, ClickToCopy, Icon, Translation, Checkbox, Loading, SortableTable } from "@reactioncommerce/reaction-ui";
import { Orders } from "/lib/collections";
import OrderTableColumn from "./orderTableColumn";
import OrderBulkActionsBar from "./orderBulkActionsBar";
import { formatPriceString } from "/client/api";
import { Badge, ClickToCopy, Icon, Translation, Button } from "@reactioncommerce/reaction-ui";
import ProductImage from "./productImage";

const classNames = {
Expand Down Expand Up @@ -37,13 +36,19 @@ const classNames = {
class OrderTable extends Component {
static propTypes = {
displayMedia: PropTypes.func,
handleBulkPaymentCapture: PropTypes.func,
handleClick: PropTypes.func,
handleSelect: PropTypes.func,
isLoading: PropTypes.object,
isOpen: PropTypes.bool,
multipleSelect: PropTypes.bool,
orders: PropTypes.array,
renderFlowList: PropTypes.bool,
selectAllOrders: PropTypes.func,
selectedItems: PropTypes.array
selectedItems: PropTypes.array,
setShippingStatus: PropTypes.func,
shipping: PropTypes.object,
toggleShippingFlowList: PropTypes.func
}

/**
Expand All @@ -67,15 +72,6 @@ class OrderTable extends Component {
return "default";
}

/**
* Shipping Badge
* TODO: any logic here, we don't have shipping status changes at the moment
* @return {string} A string containing the type of Badge
*/
shippingBadgeStatus() {
return "basic";
}

renderOrderButton(order) {
const startWorkflow = order.workflow.status === "new";
const classes = classnames({
Expand Down Expand Up @@ -156,7 +152,7 @@ class OrderTable extends Component {
badgeSize="large"
i18nKeyLabel={`cartDrawer.${order.shipping[0].workflow.status}`}
label={order.shipping[0].workflow.status}
status={this.shippingBadgeStatus(order)}
status="basic"
/>
<Badge
badgeSize="large"
Expand Down Expand Up @@ -189,44 +185,6 @@ class OrderTable extends Component {
);
}

renderBulkOrderActionsBar = () => {
const { orders, multipleSelect, selectedItems, selectAllOrders } = this.props;

if (selectedItems.length > 0) {
return (
<div className="bulk-order-actions-bar">
<Checkbox
className="checkbox-large orders-checkbox"
checked={selectedItems.length === orders.length || multipleSelect}
name="orders-checkbox"
onChange={() => selectAllOrders(orders, (selectedItems.length === orders.length || multipleSelect))}
/>
<Translation
className="selected-orders"
defaultValue={`${selectedItems.length} Selected`}
i18nKey={`${selectedItems.length} order.selected`}
/>
<Button
status="success"
bezelStyle="solid"
className="capture-orders-button"
label="Capture"
i18nKeyLabel="order.capture"
/>
<Button
status="default"
bezelStyle="solid"
className="bulk-actions-button"
label="Bulk Actions"
i18nKeyLabel="order.bulkActions"
icon="fa fa-chevron-down"
iconAfter={true}
/>
</div>
);
}
}

render() {
let getTrProps = undefined;
let getTheadProps = undefined;
Expand Down Expand Up @@ -308,7 +266,6 @@ class OrderTable extends Component {
handleSelect={this.props.handleSelect}
selectedItems={this.props.selectedItems}
fulfillmentBadgeStatus={this.fulfillmentBadgeStatus}
shippingBadgeStatus={this.shippingBadgeStatus}
/>
)
};
Expand Down Expand Up @@ -350,7 +307,20 @@ class OrderTable extends Component {

return (
<div>
{this.props.isOpen && this.renderBulkOrderActionsBar()}
{this.props.isOpen &&
<OrderBulkActionsBar
shipping={this.props.shipping}
multipleSelect={this.props.multipleSelect}
orders={this.props.orders}
selectAllOrders={this.props.selectAllOrders}
selectedItems={this.props.selectedItems}
setShippingStatus={this.props.setShippingStatus}
isLoading={this.props.isLoading}
renderFlowList={this.props.renderFlowList}
toggleShippingFlowList={this.props.toggleShippingFlowList}
handleBulkPaymentCapture={this.props.handleBulkPaymentCapture}
/>
}
<SortableTable
tableClassName={`rui order table -highlight ${this.props.selectedItems.length > 0 ?
"table-header-hidden" :
Expand All @@ -368,13 +338,11 @@ class OrderTable extends Component {
getTrGroupProps={getTrGroupProps}
getPaginationProps={() => {
return {
className: this.props.isOpen && this.props.selectedItems.length > 0 ?
"order-table-pagination-hidden" :
"order-table-pagination-visible"
className: "order-table-pagination-visible"
};
}}
getTableProps={getTableProps}
showPaginationTop={true}
showPaginationTop={this.props.selectedItems.length ? false : true}
/>
</div>
);
Expand Down
Loading

0 comments on commit ab498c7

Please sign in to comment.