Add Pirania admin

plugins/lime-plugin-pirania/src/PiraniaPage.js

@@ -133,12 +133,14 @@ export const Pirania = ({
 					<Create
 						goBack={() => setPage(0)}
 						daysLeft={daysLeft}
+						date={payday}
 					/>
 				)}
 				{page === 3 && (
 					<Renew
 						goBack={() => setPage(0)}
 						daysLeft={daysLeft}
+						renewDate={payday}
 					/>
 				)}
 			</div>

plugins/lime-plugin-pirania/src/pages/admin.js

@@ -3,7 +3,7 @@ import I18n from 'i18n-js';
 
 const Admin = ({ visitors, members, list, create, renew, download, daysLeft }) => (
 	<div>
-		<Box title={I18n.t('Next month')}>
+		<Box title={I18n.t('Current month')}>
 			<div class="info">
 				<span>
 					<b>{I18n.t('Members')}: </b>
@@ -24,7 +24,7 @@ const Admin = ({ visitors, members, list, create, renew, download, daysLeft }) =
 				{I18n.t('Show all vouchers')}
 			</button>
 		</Box>
-		<Box title={I18n.t('Last month')}>
+		{/* <Box title={I18n.t('Last month')}>
 			<div class="info">
 				<span>
 					<b>{I18n.t('Members')}: </b>
@@ -40,7 +40,7 @@ const Admin = ({ visitors, members, list, create, renew, download, daysLeft }) =
 			<button class="button green block" onClick={download}>
 				{I18n.t('Download CSV')}
 			</button>
-		</Box>
+		</Box> */}
 		{/* WIP: Node election */}
 		{/* <Box title={I18n.t('Admins elegidos')}>
 			<div class="info">
@@ -50,9 +50,9 @@ const Admin = ({ visitors, members, list, create, renew, download, daysLeft }) =
 				<br />
 			</div>
 			<button
-style={{ marginTop: 15 }}
-				class="button green block"
-onClick={elect}
+				style={{ marginTop: 15 }}
+								class="button green block"
+				onClick={elect}
 			>
 				{I18n.t('Elegir')}
 			</button>

plugins/lime-plugin-pirania/src/pages/create.js

@@ -14,12 +14,17 @@ import Loading from '../../../../src/components/loading';
 import daysFromNow from '../../../../src/utils/daysFromNow';
 import makeid from '../../../../src/utils/makeid';
 
-function Create({ goBack, createMemberVoucher, createVisitorVoucher, daysLeft, createVoucher, loading }) {
+function Create({ goBack, createMemberVoucher, createVisitorVoucher, daysLeft, createVoucher, loading, date }) {
 	const [voucherQuantity, setVoucherQuantity] = useState(1);
 	const [daysQuantity, setDaysQuantity] = useState(1);
 	const [note, setNote] = useState('marcos android');
 	const [confirm, setConfirm] = useState(false);
 	const [member, setMember] = useState(false);
+	const splitDate = date.split('/');
+	const day = parseInt(splitDate[0]);
+	const month = parseInt(splitDate[1] - 1);
+	const year = parseInt(splitDate[2]);
+	const epoc = new Date(year, month, day + 1).valueOf();
 
 	function handleInput(e, input) {
 		setVoucherQuantity;
@@ -38,7 +43,7 @@ function Create({ goBack, createMemberVoucher, createVisitorVoucher, daysLeft, c
 		return createMemberVoucher({
 			secret: makeid(8),
 			note,
-			epoc: daysFromNow(daysLeft + 1)
+			epoc
 		});
 	}
 	function addVisitor() {

plugins/lime-plugin-pirania/src/pages/renew.js

@@ -2,16 +2,16 @@ import { h } from 'preact';
 import { useEffect, useState } from 'preact/hooks';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import { getVoucherList } from '../piraniaActions';
-import { vouchers, loading } from '../piraniaSelectors';
+import { getVoucherList, renewVouchers } from '../piraniaActions';
+import { vouchers, loading, renewed } from '../piraniaSelectors';
 import Loading from '../../../../src/components/loading';
 import { Box } from '../../../../src/components/box';
 import { Select } from '../../../../src/components/select';
 import { mergeTypes } from './list';
 
 import I18n from 'i18n-js';
 
-function RenewContent ({ vouchers, handleCheck, selected }) {
+function RenewContent({ vouchers, handleCheck, selected }) {
 	let flatList = {
 		member: {},
 		visitor: {},
@@ -31,17 +31,25 @@ function RenewContent ({ vouchers, handleCheck, selected }) {
 	));
 }
 
-function renewVouchers () {
-
-	/* TODO */
-}
-
-function Renew ({ goBack, loading, vouchers, getVoucherList }) {
-	const [ selected, setSelected ] = useState([]);
-	function handleCheck (e) {
+function Renew({ goBack, loading, vouchers, getVoucherList, daysLeft, renewDate, renewVouchers, renewed }) {
+	const [selected, setSelected] = useState([]);
+	function handleCheck(e) {
 		const newList = selected.filter(i => i !== e.target.value);
 		setSelected(newList);
 	}
+	function handleRenew() {
+		const splitDate = renewDate.split('/');
+		const day = parseInt(splitDate[0]);
+		const month = parseInt(splitDate[1]);
+		const year = parseInt(splitDate[2]);
+		console.log(day + 1, month, year);
+		const epoc = new Date(year, month, day + 1).valueOf();
+		console.log('epoc', epoc);
+		renewVouchers({
+			date: epoc,
+			vouchers: selected
+		});
+	}
 	useEffect(() => {
 		getVoucherList();
 		return () => { };
@@ -52,24 +60,26 @@ function Renew ({ goBack, loading, vouchers, getVoucherList }) {
 			.map(v => v.voucher);
 		setSelected(firstSelected);
 	}
+	console.log('renewed', renewed);
 	return (
 		<div>
-			<Box title={I18n.t('Renew')}>
+			<Box title={daysLeft + ' ' + I18n.t('days left')}>
 				{!loading && vouchers
 					? <RenewContent
 						vouchers={vouchers}
 						handleCheck={handleCheck}
 						selected={selected}
-					  />
+					/>
 					: <Loading />
 				}
 			</Box>
 			<div>
-				<button class="button green block button-one" onClick={renewVouchers}>
-					{I18n.t('Renovar')}
+				<h4>{I18n.t('Renew vouchers until')} {renewDate}</h4>
+				<button class="button green block button-one" disabled={loading} onClick={handleRenew}>
+					{I18n.t('Renew')}
 				</button>
 				<button class="button green block" onClick={goBack}>
-					{I18n.t('Cancelar')}
+					{I18n.t('Cancel')}
 				</button>
 			</div>
 		</div>
@@ -78,10 +88,12 @@ function Renew ({ goBack, loading, vouchers, getVoucherList }) {
 
 export const mapStateToProps = state => ({
 	loading: loading(state),
-	vouchers: vouchers(state)
+	vouchers: vouchers(state),
+	renewed: renewed(state)
 });
 
 export const mapDispatchToProps = dispatch => ({
-	getVoucherList: bindActionCreators(getVoucherList, dispatch)
+	getVoucherList: bindActionCreators(getVoucherList, dispatch),
+	renewVouchers: bindActionCreators(renewVouchers, dispatch)
 });
 export default connect(mapStateToProps, mapDispatchToProps)(Renew);

plugins/lime-plugin-pirania/src/piraniaActions.js

@@ -3,8 +3,8 @@ import {
 	LOAD_GOVERNANCE,
 	LOAD_VOUCHERS,
 	CREATE_MEMBER_VOUCHER,
-	CREATE_VISITOR_VOUCHER
-	// RENEW_MEMBER_VOUCHERS,
+	CREATE_VISITOR_VOUCHER,
+	RENEW_MEMBER_VOUCHERS
 	// DELETE_VOUCHER
 } from './piraniaConstants';
 
@@ -29,3 +29,8 @@ export const createVisitorVoucher = (payload) => ({
 	type: CREATE_VISITOR_VOUCHER,
 	payload
 });
+
+export const renewVouchers = (payload) => ({
+	type: RENEW_MEMBER_VOUCHERS,
+	payload
+});

plugins/lime-plugin-pirania/src/piraniaApi.js

@@ -6,3 +6,4 @@ export const getGovernance = (api, sid) => api.call(sid, 'pirania-app', 'show_go
 export const getVoucherList = (api, sid) => api.call(sid, 'pirania', 'list_vouchers', {});
 export const addMemberVoucher = (api, sid, input) => api.call(sid, 'pirania', 'add_member_voucher', input);
 export const addVisitorVoucher = (api, sid, input) => api.call(sid, 'pirania', 'add_visitor_voucher', input);
+export const runRenewVouchers = (api, sid, input) => api.call(sid, 'pirania', 'renew_many_vouchers', input);

plugins/lime-plugin-pirania/src/piraniaEpics.js

@@ -1,10 +1,11 @@
-import { getActiveVouchers, getGovernance, getVoucherList, addMemberVoucher, addVisitorVoucher } from './piraniaApi';
+import { getActiveVouchers, getGovernance, getVoucherList, addMemberVoucher, addVisitorVoucher, runRenewVouchers } from './piraniaApi';
 import {
 	LOAD_ACTIVE_VOUCHERS, LOAD_ACTIVE_VOUCHERS_SUCCESS, LOAD_ACTIVE_VOUCHERS_ERROR,
 	LOAD_GOVERNANCE, LOAD_GOVERNANCE_SUCCESS, LOAD_GOVERNANCE_ERROR,
 	LOAD_VOUCHERS, LOAD_VOUCHERS_SUCCESS, LOAD_VOUCHERS_ERROR,
 	CREATE_MEMBER_VOUCHER, CREATE_MEMBER_VOUCHER_SUCCESS, CREATE_MEMBER_VOUCHER_ERROR,
-	CREATE_VISITOR_VOUCHER, CREATE_VISITOR_VOUCHER_SUCCESS, CREATE_VISITOR_VOUCHER_ERROR
+	CREATE_VISITOR_VOUCHER, CREATE_VISITOR_VOUCHER_SUCCESS, CREATE_VISITOR_VOUCHER_ERROR,
+	RENEW_MEMBER_VOUCHERS, RENEW_MEMBER_VOUCHERS_SUCCESS, RENEW_MEMBER_VOUCHERS_ERROR
 } from './piraniaConstants';
 
 import 'rxjs/add/operator/map';
@@ -104,5 +105,22 @@ const createVisitorVoucher = (action$, store, { wsAPI }) =>
 			{ type: 'NOTIFICATION', payload: { msg: 'Error' } }
 		]);
 
+const renewVouchers = (action$, store, { wsAPI }) =>
+	action$
+		.ofType(RENEW_MEMBER_VOUCHERS)
+		.mergeMap(action => runRenewVouchers(wsAPI, store.value.admin.sid, action.payload))
+		.mergeMap(payload => {
+			if (payload.code) {
+				return [
+					{ type: RENEW_MEMBER_VOUCHERS_ERROR, payload },
+					{ type: 'NOTIFICATION', payload: { msg: payload.message } }
+				];
+			}
+			return [{ type: RENEW_MEMBER_VOUCHERS_SUCCESS, payload }];
+		})
+		.catch([
+			{ type: RENEW_MEMBER_VOUCHERS_ERROR },
+			{ type: 'NOTIFICATION', payload: { msg: 'Error' } }
+		]);
 
-export default { loadActiveVouchers, loadGovernance, loadVoucherList, createMemberVoucher, createVisitorVoucher };
+export default { loadActiveVouchers, loadGovernance, loadVoucherList, createMemberVoucher, createVisitorVoucher, renewVouchers };

plugins/lime-plugin-pirania/src/piraniaReducer.js

@@ -3,7 +3,8 @@ import {
 	LOAD_GOVERNANCE, LOAD_GOVERNANCE_SUCCESS, LOAD_GOVERNANCE_ERROR,
 	LOAD_VOUCHERS, LOAD_VOUCHERS_SUCCESS, LOAD_VOUCHERS_ERROR,
 	CREATE_MEMBER_VOUCHER, CREATE_MEMBER_VOUCHER_SUCCESS, CREATE_MEMBER_VOUCHER_ERROR,
-	CREATE_VISITOR_VOUCHER, CREATE_VISITOR_VOUCHER_SUCCESS, CREATE_VISITOR_VOUCHER_ERROR
+	CREATE_VISITOR_VOUCHER, CREATE_VISITOR_VOUCHER_SUCCESS, CREATE_VISITOR_VOUCHER_ERROR,
+	RENEW_MEMBER_VOUCHERS, RENEW_MEMBER_VOUCHERS_SUCCESS, RENEW_MEMBER_VOUCHERS_ERROR
 } from './piraniaConstants';
 
 export const initialState = {
@@ -20,6 +21,7 @@ export const reducer = (state = initialState, { type, payload }) => {
 		case LOAD_VOUCHERS:
 		case CREATE_VISITOR_VOUCHER:
 		case CREATE_MEMBER_VOUCHER:
+		case RENEW_MEMBER_VOUCHERS:
 			return Object.assign({}, state, { loading: true });
 		case LOAD_ACTIVE_VOUCHERS_SUCCESS:
 			return Object.assign({}, state, { activeVouchers: payload.vouchers, loading: false });
@@ -39,6 +41,10 @@ export const reducer = (state = initialState, { type, payload }) => {
 		case CREATE_MEMBER_VOUCHER_ERROR:
 		case CREATE_VISITOR_VOUCHER_ERROR:
 			return Object.assign({}, state, { loading: false });
+		case RENEW_MEMBER_VOUCHERS_SUCCESS:
+			return Object.assign({}, state, { renewed: payload, loading: false });
+		case RENEW_MEMBER_VOUCHERS_ERROR:
+			return Object.assign({}, state, { loading: false });
 		default:
 			return state;
 	}

plugins/lime-plugin-pirania/src/piraniaSelectors.js

@@ -3,3 +3,4 @@ export const governance = state => state.pirania.governance;
 export const vouchers = state => state.pirania.vouchers;
 export const loading = state => state.pirania.loading;
 export const createVoucher = state => state.pirania.createVoucher;
+export const renewed = state => state.pirania.renewed;