-
Notifications
You must be signed in to change notification settings - Fork 2.2k
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
imports/plugins/core/checkout/client/templates/checkout/addressBook/addressBook.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import { Template } from "meteor/templating"; | ||
| import { Reaction } from "/client/api"; | ||
|
|
||
| Template.checkoutAddressBook.onCreated(function () { | ||
| Reaction.showActionView({ | ||
| provides: "settings", | ||
| name: "settings/shipping", | ||
| template: "shippingSettings" | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
imports/plugins/core/orders/client/components/invoice.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| import React, { Component, PropTypes } from "react"; | ||
| import { formatPriceString } from "/client/api"; | ||
| import { Translation } from "/imports/plugins/core/ui/client/components"; | ||
| import DiscountList from "/imports/plugins/core/discounts/client/components/list"; | ||
|
|
||
| class Invoice extends Component { | ||
| static propTypes = { | ||
| canMakeAdjustments: PropTypes.bool, | ||
| collection: PropTypes.string, | ||
| dateFormat: PropTypes.func, | ||
| discounts: PropTypes.bool, | ||
| handleClick: PropTypes.func, | ||
| invoice: PropTypes.object, | ||
| isFetching: PropTypes.bool, | ||
| isOpen: PropTypes.bool, | ||
| orderId: PropTypes.string, | ||
| paymentCaptured: PropTypes.bool, | ||
| refunds: PropTypes.array | ||
| } | ||
|
|
||
| renderDiscountForm() { | ||
| const { isOpen, orderId, collection } = this.props; | ||
|
|
||
| return ( | ||
| <div> | ||
| {isOpen && | ||
| <div> | ||
| <hr/> | ||
| <DiscountList | ||
| id={orderId} | ||
| collection={collection} | ||
| validatedInput={true} | ||
| /> | ||
| <hr/> | ||
| </div> | ||
| } | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| renderRefundsInfo() { | ||
| const { isFetching, refunds, dateFormat } = this.props; | ||
|
|
||
| return ( | ||
| <div> | ||
| {isFetching && | ||
| <div className="form-group order-summary-form-group"> | ||
| <strong>Loading Refunds</strong> | ||
| <div className="invoice-details"> | ||
| <i className="fa fa-spinner fa-spin" /> | ||
| </div> | ||
| </div> | ||
| } | ||
|
|
||
| {refunds && refunds.map((refund) => ( | ||
| <div className="order-summary-form-group text-danger" key={refund.created} style={{ marginBottom: 15 }}> | ||
| <strong>Refunded on: {dateFormat(refund.created, "MM/D/YYYY")}</strong> | ||
| <div className="invoice-details"><strong>{formatPriceString(refund.amount)}</strong></div> | ||
| </div> | ||
| ))} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| renderTotal() { | ||
| const { invoice } = this.props; | ||
|
|
||
| return ( | ||
| <div className="order-summary-form-group"> | ||
| <hr/> | ||
| <strong>TOTAL</strong> | ||
| <div className="invoice-details"> | ||
| <strong>{formatPriceString(invoice.total)}</strong> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| renderConditionalDisplay() { | ||
| const { canMakeAdjustments, paymentCaptured } = this.props; | ||
|
|
||
| return ( | ||
| <div> | ||
| {canMakeAdjustments ? | ||
| <div> {this.renderTotal()} </div> : | ||
| <span> | ||
| {paymentCaptured ? | ||
| <div> | ||
| {this.renderRefundsInfo()} | ||
| </div> | ||
| : | ||
| <div> {this.renderTotal()} </div> | ||
| } | ||
| </span> | ||
| } | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| const { invoice, discounts, handleClick } = this.props; | ||
|
|
||
| return ( | ||
| <div> | ||
| <div className="order-summary-form-group"> | ||
| <strong>Quantity Total</strong> | ||
| <div className="invoice-details"> | ||
| {invoice.totalItems} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong><Translation defaultValue="Subtotal" i18nKey="cartSubTotals.subtotal"/></strong> | ||
| <div className="invoice-details"> | ||
| {formatPriceString(invoice.subtotal)} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong><Translation defaultValue="Shipping" i18nKey="cartSubTotals.shipping"/></strong> | ||
| <div className="invoice-details"> | ||
| {formatPriceString(invoice.shipping)} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong><Translation defaultValue="Tax" i18nKey="cartSubTotals.tax"/></strong> | ||
| <div className="invoice-details"> | ||
| {formatPriceString(invoice.taxes)} | ||
| </div> | ||
| </div> | ||
|
|
||
| {discounts && | ||
| <div> | ||
| <div className="order-summary-form-group"> | ||
| <strong><Translation defaultValue="Discount" i18nKey="cartSubTotals.discount"/></strong> | ||
| <div className="invoice-details"> | ||
| <i className="fa fa-tag fa-lg" style={{ marginRight: 2 }}/> | ||
| <a className="btn-link" Discount</a> | ||
| </div> | ||
| </div> | ||
| {this.renderDiscountForm()} | ||
| </div> | ||
| } | ||
| {this.renderConditionalDisplay()} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default Invoice; | ||
|
|
150 changes: 150 additions & 0 deletions
150
imports/plugins/core/orders/client/components/lineItems.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| import React, { Component, PropTypes } from "react"; | ||
| import { formatPriceString } from "/client/api"; | ||
| import { Translation } from "/imports/plugins/core/ui/client/components"; | ||
|
|
||
| class LineItems extends Component { | ||
| static propTypes = { | ||
| displayMedia: PropTypes.func, | ||
| handleClick: PropTypes.func, | ||
| isExpanded: PropTypes.func, | ||
| onClose: PropTypes.func, | ||
| uniqueItems: PropTypes.array | ||
| } | ||
|
|
||
| calculateTotal(price, shipping, taxes) { | ||
| return formatPriceString(price + shipping + taxes); | ||
| } | ||
|
|
||
| renderLineItem(uniqueItem, quantity) { | ||
| const { handleClick, displayMedia } = this.props; | ||
|
|
||
| return ( | ||
| <div className="order-items"> | ||
| <div | ||
| className="invoice order-item form-group order-summary-form-group" | ||
| => handleClick(uniqueItem.cartItemId)} | ||
| style={{ height: 70 }} | ||
| > | ||
|
|
||
| <div className="order-item-media" style={{ marginLeft: 15 }}> | ||
| { !displayMedia(uniqueItem) ? | ||
| <img src= "/resources/placeholder.gif" /> : | ||
| <img | ||
| src={displayMedia(uniqueItem).url()} | ||
| /> | ||
| } | ||
| </div> | ||
|
|
||
| <div className="order-item-details"> | ||
| <div className="order-detail-title"> | ||
| {uniqueItem.title} <br/><small>{uniqueItem.variants.title}</small> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-detail-quantity"> | ||
| {quantity || 1} | ||
| </div> | ||
|
|
||
| <div className="order-detail-price"> | ||
| <div className="invoice-details" style={{ marginRight: 15 }}> | ||
| <strong>{formatPriceString(uniqueItem.variants.price)}</strong> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| renderLineItemInvoice(uniqueItem, shippingRate, quantity) { | ||
| return ( | ||
| <div> | ||
| <div className="order-summary-form-group"> | ||
| <strong><Translation defaultValue="Subtotal" i18nKey="cartSubTotals.subtotal"/></strong> | ||
| <div className="invoice-details"> | ||
| {formatPriceString(uniqueItem.variants.price)} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong><Translation defaultValue="Shipping" i18nKey="cartSubTotals.shipping"/></strong> | ||
| <div className="invoice-details"> | ||
| {formatPriceString(shippingRate)} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong>Item tax</strong> | ||
| <div className="invoice-details"> | ||
| {uniqueItem.taxDetail ? formatPriceString(uniqueItem.taxDetail.tax / quantity) : formatPriceString(0)} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong>Tax code</strong> | ||
| <div className="invoice-details"> | ||
| {uniqueItem.taxDetail ? uniqueItem.taxDetail.taxCode : uniqueItem.variants.taxCode} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="order-summary-form-group"> | ||
| <strong>TOTAL</strong> | ||
| <div className="invoice-details"> | ||
| {uniqueItem.taxDetail ? | ||
| <strong> | ||
| {this.calculateTotal(uniqueItem.variants.price, shippingRate, uniqueItem.taxDetail.tax)} | ||
| </strong> : | ||
| <strong> | ||
| {this.calculateTotal(uniqueItem.variants.price, shippingRate, 0)} | ||
| </strong> | ||
| } | ||
| </div> | ||
| </div> | ||
| <br/> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| const { uniqueItems, isExpanded, onClose } = this.props; | ||
|
|
||
| return ( | ||
| <div> | ||
| {uniqueItems.map((uniqueItem) => { | ||
| if (!isExpanded(uniqueItem.cartItemId)) { | ||
| return ( | ||
| <div key={uniqueItem.cartItemId}> { this.renderLineItem(uniqueItem.items[0], uniqueItem.items.length) } </div> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <div className="roll-up-invoice-list" key={uniqueItem.cartItemId}> | ||
| <div className="roll-up-content"> | ||
|
|
||
| <div style={{ float: "right" }}> | ||
| <button className="rui btn btn-default flat icon-only" => onClose(uniqueItem.cartItemId)}> | ||
| <i | ||
| className="rui font-icon fa-lg fa fa-times" | ||
| /> | ||
| </button> | ||
| </div> | ||
|
|
||
| <br/><br/> | ||
|
|
||
| {uniqueItem.items.map((item) => ( | ||
| <div key={item._id}> | ||
| { this.renderLineItem(item) } | ||
| { this.renderLineItemInvoice(item, uniqueItem.shippingRate, uniqueItem.items.length) } | ||
| </div> | ||
| ))} | ||
|
|
||
| </div> | ||
| </div> | ||
| ); | ||
| })} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default LineItems; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Create "Tax Detail" view in Orders Dashboard #2005
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Uh oh!
There was an error while loading. Please reload this page.
Create "Tax Detail" view in Orders Dashboard #2005
Changes from all commits
d5b134cdc3926af7ba191980e73cb8837218dd49b4acf41575eed248b84b6cbad09d53325adc9b9c4f4731bce7b071dffacb66df9ebbe562838dd08ac9a3d15af1cb5d3328a3a6d979a99ba7028cfd9f2fefc6174ee921bf962ba156a2fe8de1789f82704ace0e11e8e43c4256412df8338d306dea6a033ff063d824f7336ea90845e6e9bd0a0a53ac786d99536c719cda2b18d1d7c66bee8e8475d4b88b8f7a94f2eeac5716b5d9af145399dcf97f1fe558fde8f1ff4f3ec9f745ec56a040d9fd6837862dc1b05a0983f977680d14700cd05f7eb467c6124235fd058cca571016c27227dc9456af559e86757b1032bd0bc4ac0cedae6b01ac02e847956f23a73e0415f53eb18b45a4a167c97bf532583c5cc5029c086f5b3863dd334e9f9a7ce875a01c502d05f5d237910e6ddc13970dffe6abd8522efcec736f30a115edc81f94a5c60081f882b1b22608dacbc88ef40855b348a41810270bdedd9c7087c1271b8c03ddcb52e4fcb542700509b4311e084ba61c7ee676c0d21c6745c42873019e2f2c28b88fb0e2774a6156171f387a18423d0f41File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.