 AdrienHalletUCL
|
fe01129b0f
|
Merge branch 'integration' of https://github.com/AdrienHalletUCL/HaitiWater into integration
|
2019-03-09 17:39:37 +01:00 |
|
|
AdrienHalletUCL
|
e0acaf5a04
|
Lock buttons when sending
|
2019-03-09 17:39:34 +01:00 |
|
|
CelineDknp
|
8fcb586d61
|
Fixes after merge
|
2019-03-09 16:47:23 +01:00 |
|
|
Sébastien Strebelle
|
ccbf93909b
|
start of manual merge, still buggy
|
2019-03-08 19:01:50 +01:00 |
|
|
Sébastien Strebelle
|
17e67a0959
|
Merge branch 'financial' into integration
# Conflicts:
# code/haitiwater/apps/api/add_table.py
# code/haitiwater/apps/api/edit_table.py
# code/haitiwater/apps/api/exports.py
# code/haitiwater/apps/api/get_table.py
# code/haitiwater/apps/api/urls.py
# code/haitiwater/apps/zone_management/static/zoneModalHandler.js
# code/haitiwater/haitiwater/settings.py
# code/haitiwater/haitiwater/urls.py
# code/haitiwater/static-common/javascripts/tables/genericTableHandler.js
|
2019-03-08 13:51:44 +01:00 |
|
|
adhallet
|
af35a865f1
|
Reorder imports and change editable condition
|
2019-03-08 11:18:19 +01:00 |
|
|
adhallet
|
eb5fe268b5
|
Merge branch 'financial' of https://github.com/AdrienHalletUCL/HaitiWater into financial
|
2019-03-08 11:17:00 +01:00 |
|
|
Sébastien Strebelle
|
37be3a55ee
|
payment not editabe for fountain managers and filter consumers by zone
|
2019-03-08 10:02:20 +01:00 |
|
|
adhallet
|
22775a89d1
|
Fountain Manager view
|
2019-03-07 21:34:07 +01:00 |
|
|
adhallet
|
3862abec29
|
Hide details when they are useless
|
2019-03-07 21:28:28 +01:00 |
|
|
adhallet
|
2f8381df9d
|
Refresh details on modification
|
2019-03-07 21:03:38 +01:00 |
|
|
adhallet
|
ea21df6b43
|
Consumer filter on zone click in financial module and helpers
|
2019-03-07 20:55:45 +01:00 |
|
|
adhallet
|
48770a7e8a
|
Change JS init order
|
2019-03-07 20:24:39 +01:00 |
|
|
CelineDknp
|
dcf3d20e45
|
Re-set the timer to 30 secondes when cache hit
|
2019-03-06 19:53:36 +01:00 |
|
|
Sébastien Strebelle
|
a3d0e3eac3
|
removing payment
|
2019-03-06 19:46:03 +01:00 |
|
|
adhallet
|
7c84004fc5
|
Financial module tables logic polish
|
2019-03-06 18:30:48 +01:00 |
|
|
adhallet
|
53734fb513
|
fix indentation error
|
2019-03-06 18:19:06 +01:00 |
|
|
CelineDknp
|
fb2eba2e7a
|
Deleting cache when edit/add/remove
|
2019-03-06 16:49:40 +01:00 |
|
|
adhallet
|
c63809cca9
|
Payment display (wip)
|
2019-03-06 14:01:56 +01:00 |
|
|
Sébastien Strebelle
|
7bb67e4a6c
|
debugged adding payment
|
2019-03-06 13:50:06 +01:00 |
|
|
adhallet
|
8f30fa136b
|
Merge branch 'financial' of https://github.com/AdrienHalletUCL/HaitiWater into financial
|
2019-03-06 13:24:37 +01:00 |
|
|
adhallet
|
27bab1653b
|
Add consumer id in payment request
|
2019-03-06 13:24:22 +01:00 |
|
|
CelineDknp
|
9885732958
|
Changed showing of unspecified phone number
|
2019-03-06 12:46:06 +01:00 |
|
|
CelineDknp
|
31f3bc3016
|
Added tank to element type
|
2019-03-06 12:40:50 +01:00 |
|
|
Sébastien Strebelle
|
e6cef295e1
|
adding and editing payments
|
2019-03-06 08:15:50 +01:00 |
|
|
adhallet
|
8256336adf
|
fix typo
|
2019-03-06 02:44:11 +01:00 |
|
|
adhallet
|
843db8ce90
|
Payment edit/delete
|
2019-03-06 02:42:48 +01:00 |
|
|
adhallet
|
176e586173
|
Generic modal handler introduction
|
2019-03-06 02:39:46 +01:00 |
|
|
adhallet
|
cf80bac153
|
Modals on financial
|
2019-03-06 02:29:01 +01:00 |
|
|
adhallet
|
d6c48d287f
|
Payment modal handler
|
2019-03-06 02:11:58 +01:00 |
|
|
adhallet
|
1f5831c5b6
|
Payment table handler
|
2019-03-06 02:01:13 +01:00 |
|
|
adhallet
|
7092930637
|
Payment modal html
|
2019-03-06 02:00:46 +01:00 |
|
|
Sébastien Strebelle
|
e113e2165c
|
fixed invoices not creating properly, now tested !
|
2019-03-05 23:30:07 +01:00 |
|
|
Sébastien Strebelle
|
8f0b087b59
|
oops, details should be GET
|
2019-03-05 22:33:35 +01:00 |
|
|
Sébastien Strebelle
|
1f2eb16c74
|
compiled introduction
|
2019-03-05 20:14:28 +01:00 |
|
|
adhallet
|
37d67bb24d
|
Get details on consumer click
|
2019-03-05 03:19:57 +01:00 |
|
|
adhallet
|
788782207f
|
Change column name from last payment to balance
|
2019-03-05 02:37:45 +01:00 |
|
|
adhallet
|
ea20416d54
|
Consumer payment table
|
2019-03-05 02:33:49 +01:00 |
|
|
adhallet
|
376f86c3f4
|
fix typo
|
2019-03-05 02:33:13 +01:00 |
|
|
adhallet
|
7c2bb6f1c2
|
Unique datatable configuration name
|
2019-03-05 01:12:08 +01:00 |
|
|
CelineDknp
|
17b23ba43d
|
Added managers
|
2019-03-04 22:32:23 +01:00 |
|
|
CelineDknp
|
57aad1e166
|
Trying perfs
|
2019-03-04 20:27:31 +01:00 |
|
|
CelineDknp
|
516dcc7737
|
Caching !
|
2019-03-04 17:20:05 +01:00 |
|
|
CelineDknp
|
f3664ca28f
|
Optimization of the water_element queries
|
2019-03-04 15:11:49 +01:00 |
|
|
adhallet
|
cc72807ba9
|
Merge branch 'financial' of https://github.com/AdrienHalletUCL/HaitiWater into financial
|
2019-03-04 00:29:57 +01:00 |
|
|
adhallet
|
cea49092e9
|
Retain new values in edition
|
2019-03-04 00:29:20 +01:00 |
|
|
Sébastien Strebelle
|
67e9038d00
|
add price and duration information for zones
|
2019-03-04 00:25:59 +01:00 |
|
|
adhallet
|
d945959b87
|
Revert "Merge fountain and kiosks price/duration into outlet"
This reverts commit b52f061d82.
|
2019-03-03 23:51:06 +01:00 |
|
|
adhallet
|
b52f061d82
|
Merge fountain and kiosks price/duration into outlet
|
2019-03-03 23:13:07 +01:00 |
|
|
adhallet
|
c5898f82d6
|
Price and duration for zones
|
2019-03-03 22:50:48 +01:00 |
|