update db retrieval

This commit is contained in:
Luke Pulverenti 2015-10-27 13:26:04 -04:00
parent 9933cbf2bd
commit 7683c156ff
8 changed files with 22 additions and 90 deletions

View file

@ -30,6 +30,6 @@
"commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa" "commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa"
}, },
"_source": "git://github.com/desandro/eventie.git", "_source": "git://github.com/desandro/eventie.git",
"_target": "~1.0.3", "_target": "^1",
"_originalSource": "eventie" "_originalSource": "eventie"
} }

View file

@ -31,6 +31,6 @@
"commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1" "commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1"
}, },
"_source": "git://github.com/desandro/get-style-property.git", "_source": "git://github.com/desandro/get-style-property.git",
"_target": "1.x", "_target": "~1.0.4",
"_originalSource": "get-style-property" "_originalSource": "get-style-property"
} }

View file

@ -25,14 +25,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.0", "_release": "1.1.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.0", "tag": "v1.1.0",
"commit": "be7ccf8df650aef1446a4e23af33f5d4e9f3000f" "commit": "be7ccf8df650aef1446a4e23af33f5d4e9f3000f"
}, },
"_source": "git://github.com/PolymerElements/iron-meta.git", "_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta" "_originalSource": "polymerelements/iron-meta"
} }

View file

@ -59,44 +59,12 @@
store.refresh(); store.refresh();
} }
var transactionIds = {};
function updateOriginalTransactionInfo(transactionId, originalTransactionId) {
if (!transactionId) {
return;
}
if (!originalTransactionId) {
return;
}
if (transactionId == 'null') {
return;
}
if (originalTransactionId == 'null') {
return;
}
transactionIds[transactionId] = originalTransactionId;
}
function validateProduct(product, callback) { function validateProduct(product, callback) {
// product attributes: // product attributes:
// https://github.com/j3k0/cordova-plugin-purchase/blob/master/doc/api.md#validation-error-codes // https://github.com/j3k0/cordova-plugin-purchase/blob/master/doc/api.md#validation-error-codes
if (!product.transaction) {
Logger.log('Transaction info missing. Failing validateProduct');
return;
}
if (!product.transaction.id) {
Logger.log('Transaction id missing. Failing validateProduct');
return;
}
var productId = product.id; var productId = product.id;
var transactionId = product.transaction.id;
transactionId = transactionIds[transactionId] || transactionId;
var receipt = product.transaction.appStoreReceipt; var receipt = product.transaction.appStoreReceipt;
var price = product.price; var price = product.price;
@ -107,12 +75,12 @@
type: "Subscription", type: "Subscription",
feature: "MBSClubMonthly", feature: "MBSClubMonthly",
storeToken: receipt, storeToken: receipt,
amt: price, amt: price
storeId: transactionId
}; };
if (enteredEmail) { if (enteredEmail) {
postData.email = enteredEmail; postData.email = enteredEmail;
postData.storeId = enteredEmail;
} }
ApiClient.ajax({ ApiClient.ajax({
@ -229,8 +197,7 @@
getProductInfo: getProduct, getProductInfo: getProduct,
beginPurchase: beginPurchase, beginPurchase: beginPurchase,
restorePurchase: restorePurchase, restorePurchase: restorePurchase,
getSubscriptionOptions: getSubscriptionOptions, getSubscriptionOptions: getSubscriptionOptions
updateOriginalTransactionInfo: updateOriginalTransactionInfo
}; };
initializeStore(); initializeStore();

View file

@ -70,30 +70,17 @@
border-radius: 5px; border-radius: 5px;
} }
.cardOverlayPlayButton { .cardOverlayMoreButton, .cardOverlayPlayButton {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 0; right: 0;
color: #333; color: #333;
width: 20px;
height: 20px;
background-color: rgba(210,210,210,.9); background-color: rgba(210,210,210,.9);
border-radius: 500px; border-radius: 500px;
padding: 6px; margin: 0 .3em .3em 0;
margin: 0 .5em .5em 0; padding: 5px;
} width: 36px;
height: 36px;
.cardOverlayMoreButton {
position: absolute;
bottom: 0;
right: 0;
color: #333;
width: 20px;
height: 20px;
background-color: rgba(210,210,210,.9);
border-radius: 500px;
padding: 6px;
margin: 0 .5em .5em 0;
} }
.grayscale { .grayscale {

View file

@ -16,12 +16,6 @@
margin: .5em 0; margin: .5em 0;
} }
.headerButton {
height: 50px;
line-height: 50px;
display: inline-block;
}
.headerUserImage { .headerUserImage {
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -93,25 +87,14 @@
} }
.headerButton { .headerButton {
margin: 0; margin: 0 5px;
background-color: transparent; background-color: transparent;
top: 0;
bottom: 0;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
border: 0 !important; border: 0 !important;
outline: none; outline: none;
padding: 0 20px;
cursor: pointer; cursor: pointer;
} display: inline-block;
.headerButton img {
height: 26px !important;
vertical-align: middle;
}
.headerButtonLeft {
padding: 0 15px;
} }
.menuArrow { .menuArrow {
@ -123,7 +106,6 @@
.headerButtonRight { .headerButtonRight {
border-width: 0 !important; border-width: 0 !important;
padding: 0 15px;
display: inline-block; display: inline-block;
} }
@ -182,6 +164,9 @@
z-index: 999; z-index: 999;
top: 0; top: 0;
border: 0; border: 0;
height: 50px;
display: flex;
align-items: center;
} }
.hiddenViewMenuBar .viewMenuBar { .hiddenViewMenuBar .viewMenuBar {
@ -262,6 +247,8 @@
top: 0; top: 0;
bottom: 0; bottom: 0;
right: 0; right: 0;
display: flex;
align-items: center;
} }
.selectedMediaFolder { .selectedMediaFolder {

View file

@ -17,8 +17,7 @@
} }
.mediaButton { .mediaButton {
height: 40px; box-sizing: content-box !important;
width: 40px;
} }
.mediaButton.remoteControlButton, .mediaButton.muteButton, .mediaButton.unmuteButton { .mediaButton.remoteControlButton, .mediaButton.muteButton, .mediaButton.unmuteButton {
@ -157,10 +156,6 @@
z-index: 2; z-index: 2;
} }
.mediaButton img {
height: 24px;
}
.nowPlayingBarCurrentTime { .nowPlayingBarCurrentTime {
vertical-align: middle; vertical-align: middle;
font-weight: normal; font-weight: normal;

View file

@ -1,7 +1,3 @@
paper-icon-button { paper-fab.keyboard-focus.paper-fab-0 {
height: 24px;
}
paper-fab.keyboard-focus.paper-fab-0 {
background: #444; background: #444;
} }