-
Ответ службы клиентского сервиса
-
") }}>
+ { ((appeal.answer !== null && appeal.answer !== "") || (appeal.documents.length > 0)) && (
+
Ответ службы клиентского сервиса
+ ) }
+ { appeal.answer !== null && appeal.answer !== "" && (
+
") }}>
+ ) }
{ appeal.documents.length > 0 && (
{ appeal.documents.map((file, index) => {
diff --git a/reducers/contractFinesReducer.js b/reducers/contractFinesReducer.js
new file mode 100644
index 0000000..b8753b3
--- /dev/null
+++ b/reducers/contractFinesReducer.js
@@ -0,0 +1,28 @@
+import { HYDRATE } from 'next-redux-wrapper';
+
+import * as actionTypes from '../constants/actionTypes';
+import initialState from "./initialState";
+
+const contractFinesReducer = (state = initialState.contract_fines, action) =>
+{
+ switch (action.type)
+ {
+ case actionTypes.CONTRACT_FINES:
+ {
+ return {
+ ...state, ...action.data,
+ };
+ }
+
+ case actionTypes.CONTRACT_FINES_RESET:
+ {
+ return {};
+ }
+
+ default: {
+ return state;
+ }
+ }
+};
+
+export default contractFinesReducer;
\ No newline at end of file
diff --git a/reducers/contractReducer.js b/reducers/contractReducer.js
index 7be5496..c13cb92 100644
--- a/reducers/contractReducer.js
+++ b/reducers/contractReducer.js
@@ -81,14 +81,6 @@ const contractReducer = (state = initialState.contract, action) =>
};
}
- case actionTypes.CONTRACT_FINES:
- {
- return {
- ...state,
- fines: action.data.fines,
- };
- }
-
case actionTypes.CONTRACT_RULES:
{
return {
diff --git a/reducers/initialState.js b/reducers/initialState.js
index fd16fbd..e69b6ba 100644
--- a/reducers/initialState.js
+++ b/reducers/initialState.js
@@ -11,10 +11,6 @@ export const defaultState = {
secondname: "",
phone: "",
},
- companies:
- {
- list: null,
- },
admin:
{
list: null,
@@ -26,6 +22,10 @@ export const defaultState = {
kpp: "",
ogrn: "",
},
+ companies:
+ {
+ list: null,
+ },
contracts_info: {},
contracts:
{
@@ -65,6 +65,7 @@ export const defaultState = {
},
},
contract_events: {},
+ contract_fines: {},
calendar: {
payments: null,
periods: null,
diff --git a/store/index.js b/store/index.js
index a1ed84d..0ce681d 100644
--- a/store/index.js
+++ b/store/index.js
@@ -13,6 +13,7 @@ import supportReducer from '../reducers/supportReducer';
import adminReducer from '../reducers/adminReducer';
import contractsInfoReducer from '../reducers/contractsInfoReducer';
import contractEventsReducer from '../reducers/contractEventsReducer';
+import contractFinesReducer from '../reducers/contractFinesReducer';
const combinedReducer = combineReducers({
auth: authReducer,
@@ -27,34 +28,35 @@ const combinedReducer = combineReducers({
admin: adminReducer,
contracts_info: contractsInfoReducer,
contract_events: contractEventsReducer,
+ contract_fines: contractFinesReducer,
});
const makeStore = (context) =>
{
const isServer = typeof window === 'undefined';
- if(isServer)
+ if(isServer)
{
return createStore(combinedReducer);
- }
+ }
else
{
const { persistStore, persistReducer } = require('redux-persist');
- const storage = require('redux-persist/lib/storage').default;
+ const storage = require('redux-persist/lib/storage').default;
- const persistConfig = {
- key: 'lkevoleasing',
- whitelist: [ 'auth', 'user', 'company', 'companies', 'contracts_info', 'contract_events' ],
- storage
- };
+ const persistConfig = {
+ key: 'lkevoleasing',
+ whitelist: [ 'auth', 'user', 'company', 'events', 'companies', 'contracts_info', 'contract_events', 'contract_fines', ],
+ storage
+ };
- const persistedReducer = persistReducer(persistConfig, combinedReducer);
- const store = createStore(persistedReducer);
+ const persistedReducer = persistReducer(persistConfig, combinedReducer);
+ const store = createStore(persistedReducer);
- store.__persistor = persistStore(store);
+ store.__persistor = persistStore(store);
window.store = store;
- return store;
+ return store;
}
}