Skip to content
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

Release 19 #1657

Merged
merged 273 commits into from
Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
273 commits
Select commit Hold shift + click to select a range
0473ffd
Remove logging
brent-hoover Nov 10, 2016
d8078af
Update package.json to reflect release number
brent-hoover Nov 10, 2016
8e5eb79
Discounts (#1556)
Nov 10, 2016
68dca93
PDP Package Layout - ReactionLayout (#1536)
mikemurray Nov 10, 2016
bca6752
More email templates (#1557)
kieckhafer Nov 10, 2016
86f52d2
Revision control for images (#1555)
brent-hoover Nov 10, 2016
1663824
Green flash on fields in PDP page after change success (#1558)
mikemurray Nov 10, 2016
c1eea40
Merge branch 'development' into release-0.18.0
kieckhafer Nov 10, 2016
eabddb7
Fixed broken PDP template
mikemurray Nov 10, 2016
a1dbed3
Patched 0.18 tests (#1566)
Nov 11, 2016
bc83c9e
move discount rates to catalog/codes to payments
Nov 11, 2016
b7db046
restore default method data
Nov 11, 2016
1c344f8
Expandable cards
mikemurray Nov 11, 2016
2dca13a
Loading component added for reactionLayout
mikemurray Nov 11, 2016
1bc4f9d
Add missing NPM dependency
mikemurray Nov 11, 2016
02cfdd2
Merge branch 'release-0.18.0' into discount-code-payments
Nov 12, 2016
b9e0aeb
Meteor 1.4.2.1 (#1575)
Nov 13, 2016
6aa638e
Merge branch 'release-0.18.0' into discount-code-payments
Nov 13, 2016
b4c537c
Use App helper rather than ad-hoc query
brent-hoover Nov 13, 2016
be6cf6e
Merge branch 'release-0.18.0' into brent-fix-issue-1399
brent-hoover Nov 13, 2016
2f08e7a
Loading component added for reactionLayout (#1570)
Nov 14, 2016
4026db8
change templates importing to use Assets collection
kieckhafer Nov 15, 2016
92f857e
renamed templates function
kieckhafer Nov 15, 2016
a4cd2c8
fixed listing errors
kieckhafer Nov 15, 2016
a32f33c
add flush & changed onCoreInit -> afterCoreInit
kieckhafer Nov 15, 2016
b9f044f
removed isOriginalTemplate, which is no longer used
kieckhafer Nov 15, 2016
5c2703e
InitTemplates() -> initTemplates()
kieckhafer Nov 15, 2016
1568d06
Change templates importing to use Assets collection (#1583)
brent-hoover Nov 15, 2016
bfabfa6
move import settings (#1573)
Nov 15, 2016
158cc8a
Update Order Progress Workflow (#1580)
kieckhafer Nov 15, 2016
e6c3d34
PDP 500 (#1572)
mikemurray Nov 15, 2016
66d0aff
i18n updates for the Templates package (#1571)
kieckhafer Nov 15, 2016
f19f739
Fix remove icon not displaying / revision change (#1564)
brent-hoover Nov 15, 2016
9ace63d
Merge pull request #1561 from reactioncommerce/brent-fix-issue-1399
Nov 15, 2016
b5b5077
updated subject to use SSR
kieckhafer Nov 15, 2016
48428ed
update templates to use SSR
kieckhafer Nov 15, 2016
0ab2a60
update templates to use SSR
kieckhafer Nov 15, 2016
1766913
added new field to update
kieckhafer Nov 15, 2016
e7360a1
update schema for email templates
kieckhafer Nov 15, 2016
66d957f
removed unused fields
kieckhafer Nov 15, 2016
2c5c853
converted old shipping code to email template
kieckhafer Nov 15, 2016
df0e9ee
Merge branch 'release-0.18.0' into pdp-accordian
mikemurray Nov 15, 2016
17585fb
Merge branch 'release-0.18.0' into discount-code-payments
Nov 15, 2016
a200f2a
Added ecmascript dependency to gridfs package
mikemurray Nov 15, 2016
7d61088
Merge branch 'release-0.18.0' into pdp-accordian
mikemurray Nov 15, 2016
8303570
updated npm dependencies
Nov 15, 2016
94c3c99
Merge branch 'release-0.18.0' into discount-code-payments
Nov 15, 2016
59ad510
removed no longer needs isOriginalTemplate
kieckhafer Nov 15, 2016
ea5d6ba
remove old console.logs
kieckhafer Nov 15, 2016
010dfa4
fixed type
kieckhafer Nov 15, 2016
0eb19c2
add ecmascript to gridfs to enable strict
kieckhafer Nov 15, 2016
dccecb9
Fixed issue with closing cards on edit
mikemurray Nov 15, 2016
ca440d2
fixed prop validation
mikemurray Nov 15, 2016
3b48518
Merge branch 'release-0.18.0' into pdp-accordian
mikemurray Nov 15, 2016
ac05694
updated welcome email to use SSR for subject
kieckhafer Nov 15, 2016
7edfff2
Upgrade to react-komposer v2
mikemurray Nov 16, 2016
2139098
Merge pull request #1587 from reactioncommerce/react-komposer-v2
Nov 16, 2016
7ddd725
Merge branch 'release-0.18.0' into pdp-accordian
mikemurray Nov 17, 2016
067a495
Fix alerts
kieckhafer Nov 17, 2016
7d1b0ae
New Email: Refunds
kieckhafer Nov 17, 2016
ce4f4a7
Merge branch 'release-0.18.0' into ek-more-emails
kieckhafer Nov 17, 2016
897739c
remove unused email templates
kieckhafer Nov 17, 2016
cd44c7c
finalizing email templates - recovery commit
kieckhafer Nov 17, 2016
181831f
email template registration
kieckhafer Nov 17, 2016
ef0b7da
linting fixes
kieckhafer Nov 17, 2016
a6947bc
launchdock verification email
kieckhafer Nov 17, 2016
cd55c28
removed errant console
kieckhafer Nov 17, 2016
097a8aa
subject update
kieckhafer Nov 17, 2016
4b4cd75
camelCasing some things
kieckhafer Nov 17, 2016
c046824
updated subject for unavailable templates
kieckhafer Nov 18, 2016
715cf0b
Merge pull request #1569 from reactioncommerce/pdp-accordian
Nov 18, 2016
bd30fd3
Merge branch 'release-0.18.0' into ek-more-emails
kieckhafer Nov 18, 2016
35c3082
Merge branch 'development' into release-0.18.0
Nov 18, 2016
1a74744
disabled form fields that shouldn't be touched
kieckhafer Nov 18, 2016
7375f35
send order notification when user adds email
kieckhafer Nov 18, 2016
3a780d5
[WIP] Updates to package registry
Nov 20, 2016
bfbc451
Merge remote-tracking branch 'origin/release-0.18.0' into package-set…
Nov 20, 2016
b35ffad
Merge pull request #1588 from reactioncommerce/ek-431-sendNotification
brent-hoover Nov 21, 2016
7ab967c
updated reaction Apps
Nov 22, 2016
e2d11a0
Merge pull request #1585 from reactioncommerce/ek-more-emails
Nov 22, 2016
b90e0f4
Merge remote-tracking branch 'origin/development' into release-0.18.0
Nov 22, 2016
ac48108
Merge remote-tracking branch 'origin/release-0.18.0' into package-set…
Nov 22, 2016
2e25174
Add localhost WS browser-policy
Nov 23, 2016
81893a7
Payment package updates, removes name
Nov 23, 2016
a4704d6
Move mergeDeep into /lib/api/helpers
Nov 24, 2016
b9865ed
Update settings handling
Nov 24, 2016
2869e66
Cleanup panels in payments, taxes
Nov 24, 2016
3d56c34
Updated package
Nov 25, 2016
5825750
PayPal as split payment methods
Nov 25, 2016
1588b3e
Add Month Translations to monthOptions helper
Nov 27, 2016
73561ed
updated payments styling, missing i18n
Nov 27, 2016
86d2199
object-curly-spacing lint rules applied
Nov 27, 2016
46ec4e6
Avoid localLocale.defineLocale warning
Nov 28, 2016
66a8f00
Clarify Auth.net credentials messaging
Nov 28, 2016
100bafe
Only display enabled payment methods to admin in checkout
Nov 28, 2016
ea74c21
Updated import/requires for moment
Nov 28, 2016
41aa37b
Updated translation
Nov 28, 2016
35cf759
Update styling for payment settings
Nov 28, 2016
a1bae0b
Merge pull request #1592 from reactioncommerce/package-settings
Nov 28, 2016
c957d67
Templates fixes (#1600)
kieckhafer Dec 6, 2016
7692a0f
Use description for HTML description (#1606)
brent-hoover Dec 7, 2016
b1bb1d5
Fix permissions on Order when "guest" user (#1607)
kieckhafer Dec 7, 2016
65fb85d
Don't publish changes on a product when product is not found (happens…
brent-hoover Dec 8, 2016
9cb6871
initiazize shippo's UI
prosf Dec 8, 2016
3f69ef3
Merge branch 'shippoIntegration' into reaction-421-shippo
prosf Dec 8, 2016
c7c771a
shippo ui configuration
prosf Dec 8, 2016
e8d79f3
fix admin UI
prosf Dec 9, 2016
4e4a87c
Fix bug that causes duplicated variants to be missing images. (#1611)
mikemurray Dec 12, 2016
89d9edb
basic UI implementation with valid api key confirmation
prosf Dec 12, 2016
82e723a
multilanguage support .delete existing api key support
prosf Dec 12, 2016
817d618
Merge branch 'release-0.18.0' into reaction-421-shippo
prosf Dec 12, 2016
539107c
fix delete api key message
prosf Dec 12, 2016
b7480b5
1st pr review fixes
prosf Dec 13, 2016
5ec9d33
fix misspelling
prosf Dec 13, 2016
9395c97
Don't blank out titles (#1617)
brent-hoover Dec 13, 2016
348fa57
fix browser-policy for websockets in Safari
jshimko Dec 13, 2016
c44946c
Fix for page title not updating when selecting product. (#1623)
mikemurray Dec 14, 2016
ff17146
Default product to blank object for instances where it may be undefin…
mikemurray Dec 14, 2016
6d81917
Build index immediately on startup so that search doesn't throw an er…
brent-hoover Dec 15, 2016
de73a10
starting with checkout flow
prosf Dec 15, 2016
05355bd
added audience permissions to registry schema, and Reaction.Apps now …
lcampanis Dec 16, 2016
780fd28
add shippoApi Schema
prosf Dec 16, 2016
68d0ba5
Fix typo in i18n file so that error message showed key instead of tex…
brent-hoover Dec 16, 2016
0bcebfb
audience is passed as an array to match any user role, excluded owner…
lcampanis Dec 17, 2016
b0ed0f1
trivial fix
prosf Dec 19, 2016
0816308
Prerender.io Integration - Feature #1249 (#1643)
Dec 20, 2016
8217a5d
Move Template editing to Sidebar (#1612)
kieckhafer Dec 20, 2016
225003b
get user and shop email for address
prosf Dec 20, 2016
29053d7
Merge pull request #1639 from reactioncommerce/1622-audience-registry…
Dec 20, 2016
b8d0df1
Merge pull request #1629 from reactioncommerce/safari-browser-policy
Dec 20, 2016
9f52b67
Fix price updates (#1633)
kieckhafer Dec 20, 2016
5146b27
Checkout discount code input (#1620)
Dec 21, 2016
fe706f0
Merge branch 'development' into release-0.18.0
brent-hoover Dec 21, 2016
c0c2831
Merge branch 'release-0.18.0' into reaction-421-shippo
prosf Dec 21, 2016
0f75442
enhance shippo schema validations
prosf Dec 21, 2016
4c70a6e
update package.json with version 0.19.0
kieckhafer Dec 21, 2016
01ac135
Merge branch 'development' into release-0.18.0
prosf Dec 22, 2016
2a4f693
Merge branch 'release-0.18.0' into reaction-421-shippo
prosf Dec 22, 2016
3b4705e
added body class for current route based on theme and routeName
lcampanis Dec 22, 2016
022c9d3
minor fixes
prosf Dec 22, 2016
b25401f
PR #1655 re-merge (#1658)
kieckhafer Dec 22, 2016
d27598b
Variants without media to inherit media from their parents (#1664)
mikemurray Dec 22, 2016
1885513
optimised method by setting/getting session
lcampanis Dec 24, 2016
6d101e8
fixed import order
lcampanis Dec 24, 2016
ff4873d
Merged in route-theme-body-class (pull request #4)
prosf Dec 27, 2016
9228ba1
add Shippo provider from Settings to Shipping Collection.Get Active C…
prosf Dec 27, 2016
2e69144
starting..
prosf Dec 30, 2016
0c53a81
show & select shippo rates on checkout flow.update cart when editing …
prosf Dec 30, 2016
f1712c0
Merge branch 'reaction-421-shippo' into shippo-multiple-shipping-prov…
prosf Dec 30, 2016
769f498
make it more clean and secure
prosf Dec 30, 2016
db09fcf
fix multiple bugs of previous commit
prosf Dec 30, 2016
394674a
almost done
prosf Dec 30, 2016
84dcb38
React no-ui Slider implementation
lcampanis Jan 1, 2017
175261e
React MultiSelect component implementation
lcampanis Jan 1, 2017
9034802
fixes of reaction-421 pr review
prosf Jan 2, 2017
7aec3ff
shippo providers are saved in different shipping documents
prosf Jan 2, 2017
e2ce517
add admin settings translation for templates (#1661)
kieckhafer Jan 3, 2017
e112601
add shipping Details in order confirmation screen and Admin order rev…
prosf Jan 4, 2017
d9bf60c
React MultiSelect component implementation (#1681)
lcampanis Jan 4, 2017
c08cd12
React no-ui Slider implementation (#1680)
lcampanis Jan 4, 2017
194767f
Route theme body class (#1672)
lcampanis Jan 4, 2017
c42bc48
seller can purchase carrier labels from shippo.He can print the label…
prosf Jan 4, 2017
05d2c56
Merged in route-theme-body-class (pull request #7)
lcampanis Jan 5, 2017
17f812a
Merged in react-multiselect-component (pull request #8)
lcampanis Jan 5, 2017
6095e25
merged release 19
lcampanis Jan 5, 2017
2d07880
Merged in react-no-ui-slider-component (pull request #5)
lcampanis Jan 5, 2017
bbea639
Merge branch 'release-0.19.0' of https://github.com/reactioncommerce/…
lcampanis Jan 5, 2017
abde65d
clean code , fix pr issues
prosf Jan 5, 2017
33a7e93
Merge branch 'release-0.19.0' of bitbucket.org:artlimes/reaction_comm…
prosf Jan 5, 2017
ed3d510
Merge branch 'release-0.19.0' into reaction-421-shippo
prosf Jan 5, 2017
7955d68
Merge branch 'development' into release-0.19.0
mikemurray Jan 5, 2017
a6b781c
small fix
prosf Jan 5, 2017
8f77037
small form fixes
prosf Jan 5, 2017
a18affa
cleaner boundaries between shippo and shippoapi methods. JsDocs for t…
prosf Jan 9, 2017
3e5392e
make pr review fixes
prosf Jan 9, 2017
fc44220
Merge branch 'release-0.19.0' of https://github.com/reactioncommerce/…
lcampanis Jan 9, 2017
cadf722
get Registry for Current route for enabled package only
lcampanis Jan 9, 2017
e0dd0fe
Merge branch 'release-0.19.0' of bitbucket.org:artlimes/reaction_comm…
prosf Jan 9, 2017
7fdee92
Merge branch 'release-0.19.0' into reaction-421-shippo
prosf Jan 9, 2017
982fc4c
Merge branch 'development' into release-0.19.0
Jan 9, 2017
34cc06d
get rates only of enabled shipping providers
prosf Jan 9, 2017
07e656b
Merge branch 'development' into release-0.19.0
Jan 10, 2017
e499783
update shippo provider by fetching activated carriers from shippo acc…
prosf Jan 10, 2017
be55b65
small typos fixes
prosf Jan 10, 2017
d1ab807
Merge pull request #1697 from reactioncommerce/getRegistryForCurrentR…
brent-hoover Jan 11, 2017
d8d7d1f
Merge branch 'release-0.19.0' of https://github.com/reactioncommerce/…
prosf Jan 12, 2017
62f928f
Merge branch 'release-0.19.0' into reaction-421-shippo
prosf Jan 12, 2017
bc1306e
a little bit more error handling
prosf Jan 12, 2017
d7498d9
Variable cleanup (#1712)
kieckhafer Jan 13, 2017
fea036c
Merge branch 'development' into release-0.19.0
kieckhafer Jan 13, 2017
fb9f6b2
Merge remote-tracking branch 'origin/release-0.19.0' into release-0.19.0
kieckhafer Jan 13, 2017
1244aaa
Merge branch 'development' into release-0.19.0
kieckhafer Jan 13, 2017
34a4584
Merge branch 'development' into release-0.19.0
kieckhafer Jan 16, 2017
222919a
Update package.json
Jan 16, 2017
1c381a6
Merge branch 'development' into release-0.19.0
kieckhafer Jan 16, 2017
2342f3c
Merge branch 'development' into release-0.19.0
kieckhafer Jan 17, 2017
0698911
Merge pull request #1618 from reactioncommerce/reaction-421-shippo
Jan 17, 2017
6816e94
Merge branch 'development' into release-0.19.0
Jan 17, 2017
06a2fbe
Merge branch 'development' into release-0.19.0
kieckhafer Jan 19, 2017
886ab2f
1628 Move Toolbar & Admin View is Dashboard (#1723)
mikemurray Jan 19, 2017
2c3ecda
Merge branch 'development' into release-0.19.0
kieckhafer Jan 20, 2017
d9801af
1709 Allow users to change their default currency across the app usin…
lcampanis Jan 20, 2017
e6ebc8e
Shippo tracking status (#1735)
lcampanis Jan 20, 2017
763fd7a
Updated versions
mikemurray Jan 20, 2017
5e90d6b
Update dashboard and settings related registry entries (#1739)
mikemurray Jan 21, 2017
c5506bf
IOS / safari flex-wrap not working #1695 (#1727)
ch-lukas Jan 21, 2017
2921c02
Fix inventory notifications (#1736)
kieckhafer Jan 24, 2017
46d848e
yarn.lock
Jan 24, 2017
339e751
update viewAs to used profile saved data (#1748)
kieckhafer Jan 24, 2017
037d687
Color fix (#1750)
rymorgan Jan 25, 2017
59510a2
Silence of the Logs (#1745)
brent-hoover Jan 25, 2017
1dbb053
Grid View Behavior Updates (#1752)
kieckhafer Jan 26, 2017
f1ac95c
Dashboard cleanup (#1755)
mikemurray Jan 26, 2017
72d6f81
add class for not found page (#1754)
lcampanis Jan 26, 2017
04fcc18
Card, Button UI Updates (#1757)
mikemurray Jan 30, 2017
e636724
Simplified the new MultiSelect component (#1760)
lcampanis Jan 30, 2017
49d0690
Add tracking / shipping to emails (#1761)
kieckhafer Jan 31, 2017
7b223da
Shipping panel normalization (#1740)
Jan 31, 2017
6c1ea76
Merge branch 'development' into release-0.19.0
mikemurray Feb 1, 2017
d2df6e5
1759 Publish controls in toolbar (#1767)
mikemurray Feb 2, 2017
aab9a37
Added UI Slider onSlide event (#1774)
lcampanis Feb 2, 2017
c16fca4
fix "sold out" showing on all products with tags (#1776)
kieckhafer Feb 3, 2017
b447753
Release Cleanup (#1769)
Feb 3, 2017
e21907c
Updated configure now links to open proper dashboard settings (#1777)
mikemurray Feb 6, 2017
cdc0a61
Reverse edit mode toggle functions (#1788)
kieckhafer Feb 6, 2017
c30b8fc
1782 fix navbar tags (#1789)
mikemurray Feb 7, 2017
7dcd86c
Sort dashboard apps by priority
mikemurray Feb 7, 2017
16460c9
Merge pull request #1792 from reactioncommerce/1383-dashboard-priority
Feb 7, 2017
9e6166e
Fix width of inventory warning field (#1803)
kieckhafer Feb 8, 2017
c6fc205
Added order to orders list view (#1809)
mikemurray Feb 8, 2017
0287833
1791 action view responsive (#1806)
mikemurray Feb 8, 2017
d8e8860
Update grid settings panel (#1812)
mikemurray Feb 8, 2017
787b32a
Make Edit Mode on by default (#1813)
kieckhafer Feb 11, 2017
b8c518e
moved accounts registry into new core package (#1810)
kieckhafer Feb 11, 2017
4eec1c5
Prevent archived products from showing in search (#1821)
impactmass Feb 13, 2017
4c34fd3
Fix media gallery flickering and missing thumbnail (#1794)
kieckhafer Feb 14, 2017
31ad079
Fix missing Tags import/error (#1826)
brent-hoover Feb 14, 2017
ea8e34f
1780 product archive (#1816)
mikemurray Feb 14, 2017
a35aa64
Grid Publish Updates (#1824)
mikemurray Feb 15, 2017
4641280
Avalara Tax Reporting (#1733)
brent-hoover Feb 15, 2017
bf48e2a
Fix FireFox Admin search modal display (#1831)
kieckhafer Feb 15, 2017
056251b
Fix overlapping product grid alerts (#1832)
kieckhafer Feb 15, 2017
7f0e3e5
Fix typo. Resolves #1828 (#1830)
brent-hoover Feb 15, 2017
e336bf8
switch email methods to use Reaction.hasPermission API (#1829)
jshimko Feb 15, 2017
8d2052f
Resolve access-denied error on non-admin checkout (#1833)
brent-hoover Feb 15, 2017
5dd16ca
Merge branch 'development' into release-0.19.0
mikemurray Feb 15, 2017
2eddf3f
Fix height for action view - detail view (#1842)
mikemurray Feb 16, 2017
0f70831
Fix flexbox issues with icon buttons in safari (#1840)
mikemurray Feb 16, 2017
afa2495
Fix flex issues with detail view
mikemurray Feb 16, 2017
1d3b554
Fix accounts import (#1839)
mikemurray Feb 16, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ cfs:gridfs
cfs:standard-packages
cfs:storage-adapter
cfs:ui
dispatch:run-as-user
jeremy:stripe
jparker:gravatar
juliancwirko:s-alert
Expand Down Expand Up @@ -95,3 +96,4 @@ johanbrook:publication-collector


# Custom Packages
gadicc:blaze-react-component
22 changes: 12 additions & 10 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ [email protected]
[email protected]
[email protected]
[email protected]
blaze@2.2.1
blaze-html-templates@1.0.5
blaze@2.3.0
blaze-html-templates@1.1.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
caching-html-compiler@1.0.7
caching-html-compiler@1.1.0
[email protected]
cfs:[email protected]
cfs:[email protected]
Expand Down Expand Up @@ -63,13 +63,15 @@ [email protected]
[email protected]
[email protected]
dispatch:[email protected]
dispatch:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
gadicc:[email protected]
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -111,14 +113,14 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].7
[email protected].8
momentjs:[email protected]
[email protected]
[email protected]
[email protected]
mrt:[email protected]
[email protected]
[email protected].11_2
[email protected].16_1
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -147,13 +149,13 @@ [email protected]
[email protected]
[email protected]
[email protected]
spacebars-compiler@1.0.13
spacebars-compiler@1.1.0
[email protected]
[email protected]
templating@1.2.15
templating-compiler@1.2.15
templating-runtime@1.2.15
templating-tools@1.0.5
templating@1.3.0
templating-compiler@1.3.0
templating-runtime@1.3.0
templating-tools@1.1.0
tmeasday:[email protected]
tmeasday:[email protected]
[email protected]
Expand Down
7 changes: 6 additions & 1 deletion client/config/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export const DEFAULT_WORKFLOW = "coreWorkflow";

// Use this to override just the home Package
// ie: {template: "products"}
export const INDEX_OPTIONS = {};
export const INDEX_OPTIONS = {
workflow: "coreProductGridWorkflow"
};

// default load qty for product grid
export const ITEMS_INCREMENT = 24;
Expand All @@ -23,3 +25,6 @@ Session.setDefault("DEFAULT_LAYOUT", DEFAULT_LAYOUT);
Session.setDefault("DEFAULT_WORKFLOW", DEFAULT_WORKFLOW);
Session.setDefault("INDEX_OPTIONS", INDEX_OPTIONS);
Session.setDefault("productScrollLimit", ITEMS_INCREMENT);

// autoform default template
AutoForm.setDefaultTemplate("bootstrap3");
3 changes: 3 additions & 0 deletions client/modules/accounts/templates/addressBook/add/add.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ <h3 class="panel-title">
</div>
<div class="panel-body panel-content">
{{#autoForm schema=Schemas.Address id="addressBookAddForm" doc=thisAddress type="normal"}}
<div class="row">
<span id="addressbookAdd-alerts-placement">{{> inlineAlerts placement="addressBookAdd"}}</span>
</div>
<fieldset>
{{> addressBookForm}}
<div class="row text-right">
Expand Down
78 changes: 60 additions & 18 deletions client/modules/accounts/templates/addressBook/add/add.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,35 @@ Template.addressBookAdd.helpers({
}
});

Template.addressBookAdd.events({
// "click #cancel-new, form submit": function(event, template) {
// console.log(event, template, Template.instance())
// return Session.set("addressBookView", "addressBookGrid");
// },
// "submit form": function() {
// return Session.set("addressBookView", "addressBookGrid");
// }
});

export function setValidatedAddress(res) {
if (res.validatedAddress.city) {
const city = $("input[name='city']");
city.val(res.validatedAddress.city);
}
if (res.validatedAddress.postal) {
const postal = $("input[name='postal']");
postal.val(res.validatedAddress.postal);
}
if (res.validatedAddress.address1) {
const address1 = $("input[name='address1']");
address1.val(res.validatedAddress.address1);
}

if (res.validatedAddress.address2) {
const address2 = $("input[name='address2']");
address2.val(res.validatedAddress.address2);
}
if (res.validatedAddress.country) {
const country = $("select[name='country']");
country.val(res.validatedAddress.country);
}

if (res.validatedAddress.region) {
const region = $("select[name='region']");
region.val(res.validatedAddress.region);
}
}

/**
* addressBookAddForm form handling
Expand All @@ -71,18 +91,40 @@ Template.addressBookAdd.events({
AutoForm.hooks({
addressBookAddForm: {
onSubmit: function (insertDoc) {
const that = this;
this.event.preventDefault();
const addressBook = $(this.template.firstNode).closest(".address-book");

Meteor.call("accounts/addressBookAdd", insertDoc, (error, result) => {
if (error) {
Alerts.toast(i18next.t("addressBookAdd.failedToAddAddress", { err: error.message }), "error");
this.done(new Error("Failed to add address: ", error));
return false;
}
if (result) {
this.done();
addressBook.trigger($.Event("showMainView"));
Meteor.call("accounts/validateAddress", insertDoc, function (err, res) {
if (res.validated) {
Meteor.call("accounts/addressBookAdd", insertDoc, function (error, result) {
if (error) {
Alerts.toast(i18next.t("addressBookAdd.failedToAddAddress", { err: error.message }), "error");
that.done(new Error("Failed to add address: ", error));
return false;
}
if (result) {
that.done();
addressBook.trigger($.Event("showMainView"));
return true;
}
});
} else {
if (res.validatedAddress) {
setValidatedAddress(res);
Alerts.inline("Made changes to your address based upon validation. Please ensure this is correct", "warning", {
placement: "addressBookAdd",
i18nKey: "addressBookAdd.validatedAddress"
});
}
if (res.formErrors) {
for (const error of res.formErrors) {
Alerts.inline(error.details, "error", {
placement: "addressBookAdd"
});
}
}
that.done("Validation failed"); // renable Save and Continue button
}
});
}
Expand Down
3 changes: 3 additions & 0 deletions client/modules/accounts/templates/addressBook/edit/edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ <h3 class="panel-control-bar">
</div>
<div class="panel-body">
{{#autoForm schema=Schemas.Address id="addressBookEditForm" doc=address type="normal"}}
<div class="row">
<span id="addressbookEdit-alerts-placement">{{> inlineAlerts placement="addressBookEdit"}}</span>
</div>
<fieldset>
{{>addressBookForm}}
<div class="row text-right">
Expand Down
44 changes: 33 additions & 11 deletions client/modules/accounts/templates/addressBook/edit/edit.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { i18next } from "/client/api";
import { Meteor } from "meteor/meteor";
import { setValidatedAddress } from "../add/add";

/*
* update address book (cart) form handling
Expand All @@ -9,20 +10,41 @@ import { Meteor } from "meteor/meteor";
AutoForm.hooks({
addressBookEditForm: {
onSubmit: function (insertDoc) {
const that = this;
this.event.preventDefault();

const addressBook = $(this.template.firstNode).closest(".address-book");
Meteor.call("accounts/addressBookUpdate", insertDoc, (error, result) => {
if (error) {
Alerts.toast(i18next.t("addressBookEdit.somethingWentWrong", { err: error.message }), "error");
this.done(new Error(error));
return false;
}
if (result) {
this.done();

// Show the grid
addressBook.trigger($.Event("showMainView"));
Meteor.call("accounts/validateAddress", insertDoc, function (err, res) {
if (res.validated) {
Meteor.call("accounts/addressBookUpdate", insertDoc, (error, result) => {
if (error) {
Alerts.toast(i18next.t("addressBookEdit.somethingWentWrong", { err: error.message }), "error");
this.done(new Error(error));
return false;
}
if (result) {
that.done();

// Show the grid
addressBook.trigger($.Event("showMainView"));
}
});
} else {
if (res.validatedAddress) {
setValidatedAddress(res);
Alerts.inline("Made changes to your address based upon validation. Please ensure this is correct", "warning", {
placement: "addressBookEdit",
i18nKey: "addressBookAdd.validatedAddress"
});
}
if (res.formErrors) {
for (const error of res.formErrors) {
Alerts.inline(error.details, "error", {
placement: "addressBookEdit"
});
}
}
that.done("Validation failed"); // renable Save and Continue button
}
});
}
Expand Down
14 changes: 10 additions & 4 deletions client/modules/accounts/templates/addressBook/grid/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,17 @@ Template.addressBookGrid.helpers({

Template.addressBookGrid.events({
"click [data-event-action=selectShippingAddress]": function () {
return Meteor.call("accounts/addressBookUpdate", this, null,
"isShippingDefault");
// update address(make it default) only if wasn't already
if (!this.isShippingDefault) {
return Meteor.call("accounts/addressBookUpdate", this, null,
"isShippingDefault");
}
},
"click [data-event-action=selectBillingAddress]": function () {
return Meteor.call("accounts/addressBookUpdate", this, null,
"isBillingDefault");
// update address(make it default) only if wasn't already
if (!this.isBillingDefault) {
return Meteor.call("accounts/addressBookUpdate", this, null,
"isBillingDefault");
}
}
});
2 changes: 2 additions & 0 deletions client/modules/accounts/templates/dashboard/dashboard.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<template name="accountsDashboard">
{{#if hasPermission 'accounts'}}

{{> memberForm}}
<div class="container-fluid-sm">

<div class="panel panel-default">
Expand Down
2 changes: 1 addition & 1 deletion client/modules/accounts/templates/dashboard/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Template.accountsSettings.events({
* @return {void}
*/
"click [data-event-action=showSecret]": (event) => {
const button = $(event.currentTarget);
const button = Template.instance().$(event.currentTarget);
const input = button.closest(".form-group").find("input[name=secret]");

if (input.attr("type") === "password") {
Expand Down
5 changes: 4 additions & 1 deletion client/modules/accounts/templates/dropdown/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,11 @@ Template.loginDropdown.events({
});
}
});
} else if (this.route || this.name) {
} else if (this.name !== "account/profile") {
event.preventDefault();
/** TMP **/
Reaction.showActionView(this);
} else if (this.route || this.name) {
const route = this.name || this.route;
Reaction.Router.go(route);
}
Expand Down
6 changes: 3 additions & 3 deletions client/modules/accounts/templates/members/member.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const getPermissionMap = (permissions) => {
*/
Template.member.events({
"click [data-event-action=showMemberSettings]": function () {
Reaction.showActionView({
Reaction.setActionViewDetail({
label: "Permissions",
i18nKeyLabel: "admin.settings.permissionsSettingsLabel",
data: this,
Expand Down Expand Up @@ -133,14 +133,14 @@ Template.memberSettings.events({
} else {
permissions.push(self.permission);
}
if ($(event.currentTarget).is(":checked")) {
if (Template.instance().$(event.currentTarget).is(":checked")) {
Meteor.call("accounts/addUserPermissions", member.userId, permissions, this.shopId);
} else {
Meteor.call("accounts/removeUserPermissions", member.userId, permissions, this.shopId);
}
},
"click [data-event-action=resetMemberPermission]": function (event, template) {
const $icon = $(event.currentTarget);
const $icon = Template.instance().$(event.currentTarget);
if (confirm($icon.data("confirm"))) {
const results = [];
for (const role of template.data.roles) {
Expand Down
7 changes: 5 additions & 2 deletions client/modules/core/helpers/apps.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,11 @@ export function Apps(optionHash) {
reactionApps.push(registry);
}
});
// sort cycle to ensure order aka. is registry.priority working? .sort((a, b) => a.priority - b.priority).slice();
return reactionApps;

// Sort apps by priority (registry.priority)
const sortedApps = reactionApps.sort((a, b) => a.priority - b.priority).slice();

return sortedApps;
}

// Register global template helper
Expand Down
Loading