Merge branch 'release' into develop
This commit is contained in:
@@ -152,14 +152,14 @@
|
||||
"dateEndApril": "April 19",
|
||||
"dateEndMay": "May 31",
|
||||
"dateEndJune": "June 14",
|
||||
"june2018": "June 2018",
|
||||
"augustYYYY": "August <%= year %>",
|
||||
"dateEndJuly": "July 31",
|
||||
"dateEndAugust": "August 31",
|
||||
"dateEndSeptember": "September 21",
|
||||
"september2017": "September 2017",
|
||||
"september2018": "September 2018",
|
||||
"dateEndOctober": "October 31",
|
||||
"dateEndNovember": "December 3",
|
||||
"dateEndNovember": "November 30",
|
||||
"dateEndJanuary": "January 31",
|
||||
"dateEndFebruary": "February 28",
|
||||
"winterPromoGiftHeader": "GIFT A SUBSCRIPTION AND GET ONE FREE!",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import assign from 'lodash/assign';
|
||||
import defaults from 'lodash/defaults';
|
||||
import each from 'lodash/each';
|
||||
import moment from 'moment';
|
||||
import t from './translation';
|
||||
|
||||
const CURRENT_SEASON = '_NONE_';
|
||||
@@ -93,13 +94,25 @@ const premium = {
|
||||
value: 2,
|
||||
text: t('hatchingPotionEmber'),
|
||||
limited: true,
|
||||
_season: '_PENDING_',
|
||||
_addlNotes: t('eventAvailabilityReturning', {
|
||||
availableDate: t('dateEndNovember'),
|
||||
previousDate: t('augustYYYY', { year: 2017 }),
|
||||
}),
|
||||
canBuy () {
|
||||
return moment().isBetween('2019-11-12', '2019-12-02');
|
||||
},
|
||||
},
|
||||
Thunderstorm: {
|
||||
value: 2,
|
||||
text: t('hatchingPotionThunderstorm'),
|
||||
limited: true,
|
||||
_season: '_PENDING_',
|
||||
_addlNotes: t('eventAvailabilityReturning', {
|
||||
availableDate: t('dateEndNovember'),
|
||||
previousDate: t('augustYYYY', { year: 2016 }),
|
||||
}),
|
||||
canBuy () {
|
||||
return moment().isBetween('2019-11-12', '2019-12-02');
|
||||
},
|
||||
},
|
||||
Spooky: {
|
||||
value: 2,
|
||||
|
||||
@@ -8,16 +8,16 @@ const featuredItems = {
|
||||
path: 'armoire',
|
||||
},
|
||||
{
|
||||
type: 'eggs',
|
||||
path: 'eggs.PandaCub',
|
||||
type: 'premiumHatchingPotion',
|
||||
path: 'premiumHatchingPotions.Ember',
|
||||
},
|
||||
{
|
||||
type: 'hatchingPotions',
|
||||
path: 'hatchingPotions.Shade',
|
||||
type: 'premiumHatchingPotion',
|
||||
path: 'premiumHatchingPotions.Thunderstorm',
|
||||
},
|
||||
{
|
||||
type: 'food',
|
||||
path: 'food.Potatoe',
|
||||
path: 'food.Saddle',
|
||||
},
|
||||
],
|
||||
quests: [
|
||||
|
||||
Reference in New Issue
Block a user