Finn
|
3b191e5c76
|
working graphs on frontend
|
2017-12-13 14:29:17 +00:00 |
|
Finn
|
5b745f666b
|
made customer graphs work with passing test
|
2017-12-13 13:33:29 +00:00 |
|
Finn
|
536ab21551
|
fixed snippets if no values to get
|
2017-12-12 17:31:05 +00:00 |
|
Finn
|
1057eda445
|
added snippet endpoint and test
|
2017-12-12 17:21:32 +00:00 |
|
Finn
|
7d309755c6
|
adding paths and placeholder for customer dash API
|
2017-12-12 13:32:52 +00:00 |
|
Finn
|
cd59547311
|
schema and map code updated, test fixed
|
2017-12-08 13:19:22 +00:00 |
|
Finn
|
af7dcde7aa
|
esta added to schema and updated admin interface
|
2017-12-08 12:30:49 +00:00 |
|
Finn
|
95398d2790
|
Merge pull request #81 from Pear-Trading/finn/linkcorrections
added link corrections
|
2017-12-08 11:27:44 +00:00 |
|
Finn
|
0b48c69612
|
added new tab linking and corrected redirect
|
2017-12-04 12:30:10 +00:00 |
|
Finn
|
d8403b8b11
|
Revert "added new tab linking and corrected redirect"
This reverts commit 4eb5a4fd3f.
|
2017-12-04 12:29:34 +00:00 |
|
Finn
|
e926d40779
|
added new tab linking and corrected redirect
|
2017-12-04 12:27:53 +00:00 |
|
Finn
|
36cd695ed5
|
Amended validation on orgs
|
2017-11-29 16:24:03 +00:00 |
|
Finn
|
f68479b5ac
|
extra info fixed and test amended and fixtures changed
|
2017-11-27 17:16:22 +00:00 |
|
Finn
|
3f0f046c30
|
added location info to main map
|
2017-11-27 11:36:21 +00:00 |
|
Finn
|
96a9b152d1
|
extra org data added
|
2017-11-23 16:35:45 +00:00 |
|
Finn
|
54dcbf6fb8
|
fixes added and working admin interface
|
2017-11-23 16:25:14 +00:00 |
|
Finn
|
8754ffd93a
|
endpoint and code added for LIS orgs
|
2017-11-23 15:42:37 +00:00 |
|
Finn
|
a4b307ad6c
|
database upgraded and interface added
|
2017-11-23 14:54:59 +00:00 |
|
Tom Bloor
|
b92ea1f7c6
|
Added logging on admin login endpoint
|
2017-11-21 10:42:23 +00:00 |
|
Tom Bloor
|
832dab70cb
|
dded minor logging to API login endpoint
|
2017-11-21 10:40:22 +00:00 |
|
Tom Bloor
|
733107539d
|
Added badges to users and pagination
|
2017-11-20 13:26:52 +00:00 |
|
Tom Bloor
|
baffe144f3
|
Added major merge code for merging organisations
|
2017-11-17 18:10:16 +00:00 |
|
Tom Bloor
|
91677034ca
|
Finishing off CSV import functionality
|
2017-11-15 18:22:49 +00:00 |
|
Tom Bloor
|
423c68aca2
|
Allow for ignoring of values in import and toggle showing of them
|
2017-11-14 18:41:54 +00:00 |
|
Tom Bloor
|
9d07830e27
|
Added org lookup and assignment for import
|
2017-11-14 15:02:46 +00:00 |
|
Tom Bloor
|
f0b1540f3e
|
Refactored csv import flash errors
|
2017-11-14 12:57:28 +00:00 |
|
Tom Bloor
|
b873e63d55
|
Merge branch 'development' into TBSliver/Admin-Improvements
Conflicts:
CHANGELOG.md
|
2017-11-14 12:43:29 +00:00 |
|
Tom Bloor
|
72929bf86b
|
Added assigning users to import values
|
2017-11-13 19:00:34 +00:00 |
|
Tom Bloor
|
9096bef00d
|
Further work on import functions
|
2017-11-13 13:30:33 +00:00 |
|
Finn
|
105c9093b8
|
fixes
|
2017-11-10 18:39:00 +00:00 |
|
Finn
|
049b4836c5
|
Added code to leaderboard web app API
|
2017-11-10 17:07:41 +00:00 |
|
Finn
|
c4681ffc3a
|
web app api leaderboard added
|
2017-11-10 16:45:58 +00:00 |
|
Tom Bloor
|
e09974f0d9
|
First pass of importing data
|
2017-10-26 17:01:23 +01:00 |
|
Tom Bloor
|
ef36cbc541
|
Add setting of is_local to organisations
|
2017-10-24 15:23:09 +01:00 |
|
Tom Bloor
|
dcd5896cea
|
Added pagination to organisation listings
|
2017-10-24 13:31:04 +01:00 |
|
Tom Bloor
|
ed8607fd35
|
Combine organisation lists into one with badges for warnings
|
2017-10-23 17:44:38 +01:00 |
|
Tom Bloor
|
de90fe1f77
|
Added toggling of actioned on feedback, and view change for lists
|
2017-10-23 16:09:20 +01:00 |
|
Tom Bloor
|
62881a0eda
|
Added transaction distance calculation
|
2017-10-03 18:08:30 +01:00 |
|
Tom Bloor
|
37e8f0b46a
|
Updated to allow for user updates to change location by postcode
|
2017-10-03 15:47:05 +01:00 |
|
Tom Bloor
|
202deb9178
|
Added output of location on User endpoint, and setting lat/long on user
registration
|
2017-10-03 15:33:43 +01:00 |
|
Tom Bloor
|
9e127b8851
|
Finalised Transaction report graph and test
|
2017-10-02 14:08:24 +01:00 |
|
Tom Bloor
|
e667947c65
|
Fix uninitialised warning
|
2017-09-29 16:14:02 +01:00 |
|
Tom Bloor
|
a739b02eed
|
Allow for day scale of transaction report
|
2017-09-29 16:04:41 +01:00 |
|
Tom Bloor
|
cf2c7dcc4b
|
Initial pass of Transaction reports
|
2017-09-29 14:45:44 +01:00 |
|
Tom Bloor
|
c3519fa4df
|
Improved Feedback list page
|
2017-09-28 16:39:16 +01:00 |
|
Tom Bloor
|
5e078f8f8b
|
Added supplier location endpoint
|
2017-09-27 18:01:06 +01:00 |
|
Finn
|
22bdb625f0
|
Added datetime format
|
2017-09-19 17:40:17 +01:00 |
|
Finn
|
5f241bbd46
|
Tests fixed and API improved and DB upgraded
|
2017-09-19 17:23:30 +01:00 |
|
Finn
|
8e2cecfcf5
|
added read API
|
2017-09-19 15:50:58 +01:00 |
|
Finn
|
813f4af63f
|
New routes added
|
2017-09-19 14:41:11 +01:00 |
|
Finn
|
e388d360ac
|
Changed endpoints in API
|
2017-09-18 17:26:35 +01:00 |
|
Finn
|
616181def3
|
Payroll sumission API improved and test added
|
2017-09-18 17:13:18 +01:00 |
|
Finn
|
b224182e61
|
Merge branch 'development' into finn/OrgDataAPI
|
2017-09-18 15:39:14 +01:00 |
|
Finn
|
9cb4f7c782
|
Added error rewrites and added feedback test
|
2017-09-18 13:31:30 +01:00 |
|
Finn
|
9e56383b46
|
User and Register API errors improved
|
2017-09-18 11:34:22 +01:00 |
|
Finn
|
dd36cd0c0c
|
Feedback API error improved
|
2017-09-18 11:31:57 +01:00 |
|
Finn
|
414acd76fb
|
Transaction API errors improved
|
2017-09-18 11:11:53 +01:00 |
|
Tom Bloor
|
99cb3e888e
|
Merge pull request #57 from Pear-Trading/finn/interfacechange
Changed routing on submission
|
2017-09-15 13:09:50 +01:00 |
|
Tom Bloor
|
25511ced69
|
Fix calculation mistake on leadearboard display
|
2017-09-15 12:54:36 +01:00 |
|
Finn
|
d1757bdac9
|
Changed routing on submission
|
2017-09-15 11:18:27 +01:00 |
|
Tom Bloor
|
1ffabb3e94
|
Updated all endpoints to use new transaction value multiple
|
2017-09-13 16:07:23 +01:00 |
|
Tom Bloor
|
66f4844835
|
Merge pull request #55 from Pear-Trading/TBSliver/Large-Graph
Added large graph items
|
2017-09-08 15:41:10 +01:00 |
|
Finn
|
26a37904d2
|
Naming sanitised
|
2017-09-08 13:00:42 +01:00 |
|
Tom Bloor
|
6de616584a
|
Add customer_range graph
|
2017-09-08 12:47:20 +01:00 |
|
Tom Bloor
|
4176c61c00
|
Remove post user/day, and reformat validators
|
2017-09-08 12:46:54 +01:00 |
|
Finn
|
9cfd5536b9
|
Removed redundant code and added error messages
|
2017-09-08 12:15:11 +01:00 |
|
Tom Bloor
|
83094f380d
|
Continue defaulting to 0 as well
|
2017-09-08 12:03:48 +01:00 |
|
Tom Bloor
|
e13a128179
|
Add zero to sums to force number on output
|
2017-09-08 12:00:23 +01:00 |
|
Finn
|
662219fc6e
|
Initial API for submission added
|
2017-09-08 11:41:21 +01:00 |
|
Tom Bloor
|
05c20b9e85
|
Added new snippets endpoints
|
2017-09-07 16:03:01 +01:00 |
|
Finn
|
416ac6343a
|
Added ability to delete transactions successfully
|
2017-09-07 12:53:01 +01:00 |
|
Finn
|
8034844cec
|
Merge pull request #50 from Pear-Trading/finn/TransactionViewAPI
Transaction API added
|
2017-09-06 17:52:56 +01:00 |
|
Finn
|
ebe6ccb33e
|
Fixed page no
|
2017-09-06 17:03:53 +01:00 |
|
Tom Bloor
|
6ed0be4801
|
Use normal 1 instead of deferenced for proper inflation
|
2017-09-06 16:12:36 +01:00 |
|
Finn
|
4e7c8bbfae
|
Created test and fixed things
Still needs to spit out timezone on the datetime
|
2017-09-05 17:24:04 +01:00 |
|
Finn
|
06858fc005
|
Added outgoing transaction list API
|
2017-09-05 16:37:31 +01:00 |
|
Finn
|
60e6b2717e
|
Added ability for when there is no image
|
2017-09-05 13:52:05 +01:00 |
|
Finn
|
e7631dd90e
|
Code for viewing single transaction added
|
2017-09-05 13:44:58 +01:00 |
|
Finn
|
cd6c075588
|
View Transactions from a User on their page
|
2017-09-05 12:27:37 +01:00 |
|
Tom Bloor
|
cae2806ad2
|
Merge pull request #44 from Pear-Trading/finn/StopSameOrgPurchase
Stopped Orgs from buying for themselves & added to test
|
2017-09-05 12:20:25 +01:00 |
|
Tom Bloor
|
1693bc7fb6
|
Merge pull request #45 from Pear-Trading/TBSliver/Org-Graph-Improvements
Added extra graph types
|
2017-09-05 12:19:18 +01:00 |
|
Finn
|
a463b99fa9
|
Stopped Orgs from buying for themselves & added to test
|
2017-09-05 12:03:49 +01:00 |
|
Tom Bloor
|
4ba6a443fc
|
Stop null values on org graphs
|
2017-09-04 17:39:48 +01:00 |
|
Tom Bloor
|
4d21de7bae
|
Improved Graphs and added sales and purchase data graphs.
Includes an API change for development.
|
2017-09-04 17:29:28 +01:00 |
|
Finn
|
fabd01f988
|
Fixed for sector in account editing
|
2017-09-04 17:05:10 +01:00 |
|
Finn
|
2137b5607f
|
Fixed Org account editing for portal
|
2017-09-04 16:12:03 +01:00 |
|
Tom Bloor
|
4fa52901cb
|
Update add org to work with new form
|
2017-09-04 14:09:36 +01:00 |
|
Tom Bloor
|
2ef5193e41
|
Fixed organisaiton listing and editing in backend
|
2017-09-04 14:03:58 +01:00 |
|
Tom Bloor
|
cca27b5475
|
Fix org graphs test for entity upgrade
|
2017-08-31 19:12:13 +01:00 |
|
Tom Bloor
|
adfcd8880f
|
Fix User endpoints for entity upgrade
|
2017-08-31 19:08:22 +01:00 |
|
Tom Bloor
|
dd6e21eb50
|
Fix upload tests for entity upgrade
|
2017-08-31 19:03:49 +01:00 |
|
Tom Bloor
|
e91863a3d7
|
Fixed stats endpoint for leaderboards on entity upgrade
|
2017-08-31 18:31:42 +01:00 |
|
Tom Bloor
|
8d205d62c2
|
Refactor stats test to use fixtures and fix stats endpoints for entity
update
|
2017-08-31 18:04:51 +01:00 |
|
Tom Bloor
|
2980fd129f
|
Fix search test for entity upgrade
|
2017-08-31 17:54:25 +01:00 |
|
Tom Bloor
|
bf16077b10
|
Fix register for new entity work
|
2017-08-31 16:46:25 +01:00 |
|
Tom Bloor
|
4cc8aad367
|
Fix admin user test for entity upgrade
|
2017-08-31 16:38:03 +01:00 |
|
Tom Bloor
|
92afe1c531
|
Fix admin organisation management tests
|
2017-08-31 14:52:45 +01:00 |
|
Tom Bloor
|
18992784b2
|
Fix admin login test and required changes for entity upgrade
|
2017-08-31 13:35:49 +01:00 |
|
Finn
|
4189025c6f
|
Added timings and descending submit at time for receipts
|
2017-08-31 11:51:22 +01:00 |
|
Finn
|
72813ff2a3
|
Made image upload optional
|
2017-08-31 11:41:38 +01:00 |
|