Aurélien Delobelle
457ee64004
update migrations order
2017-04-08 18:38:47 +02:00
Aurélien Delobelle
784ba9bd10
Merge branch 'master' into aureplop/kfet_config
2017-04-08 18:36:28 +02:00
Aurélien Delobelle
15861824b6
Merge branch 'Aufinal/tabs' into 'master'
...
K-Fêt
- Détails d'un compte: historique et stats sont accessibles par des onglets.
See merge request !218
2017-04-08 14:41:36 +02:00
Ludovic Stephan
4a6bfd5e3d
Better button distinction
2017-04-07 12:58:03 -03:00
Ludovic Stephan
052e7b2b6e
Move navigation to content-left
2017-04-07 12:17:36 -03:00
Ludovic Stephan
e26668e5eb
Add tabs to account_read
2017-04-06 21:17:47 -03:00
Aurélien Delobelle
a0979c220b
Merge branch 'bda_pep8' into 'master'
...
Clean the `bda.views.catalogue` view
See merge request !212
2017-04-06 21:24:18 +02:00
Ludovic Stephan
9ba13a81ee
Adapt add_to_container + small improvements
2017-04-06 00:10:39 -03:00
Ludovic Stephan
23d19545a7
Add back root_sort
2017-04-05 22:23:56 -03:00
Ludovic Stephan
df47bedae1
Change ModelForest inner structure
2017-04-05 22:10:21 -03:00
Ludovic Stephan
5e68fcf315
Merge branch 'aureplop/hotfix' into 'master'
...
Aureplop/hotfix
See merge request !214
2017-04-06 00:32:29 +02:00
Aurélien Delobelle
4b2e20e728
created_at required with default
2017-04-06 00:31:04 +02:00
Aurélien Delobelle
e2d7192b23
fix perform opes after account reset
2017-04-06 00:11:41 +02:00
Aurélien Delobelle
c849306a32
fix kfet home template
2017-04-06 00:00:53 +02:00
Aurélien Delobelle
e4dd434608
no longer use model_to_dict
...
- fix cof status on k-psul
2017-04-05 23:33:45 +02:00
Aurélien Delobelle
e4ccd88dfd
Merge branch 'master' into aureplop/kpsul_js_refactor
2017-04-05 23:18:33 +02:00
Martin Pépin
981759f5ce
Adds tests covering the bda-catalogue JSON API
2017-04-05 21:02:00 +01:00
Ludovic Stephan
ed0a82ed5d
Add no_trigramme option
2017-04-05 16:51:17 -03:00
Martin Pépin
9ec151e040
A query optimization in bda.views.catalogue
...
We only need to fetch shows identifiers here:
FOO.filter(BAR__in=shows)
which can be done using the `values_list` method
2017-04-05 20:48:18 +01:00
Martin Pépin
ff9cee5ffc
line too long in bda.models
2017-04-05 20:42:50 +01:00
Martin Pépin
853a239e6e
Rewrite bda.views.catalogue
...
- No string concatenations
- Use `get_object_or_404` instead of performing a `.get` and catching
the eventual exception.
- More accurate error messages when a bad request is detected.
- More accurate error handling
2017-04-05 19:53:04 +01:00
Aurélien Delobelle
6a8f41849b
Merge branch 'Aufinal/refactor_articles' into 'aureplop/kpsul_js_refactor'
...
Aufinal/refactor articles
See merge request !173
2017-04-05 17:56:07 +02:00
Ludovic Stephan
5c422e892a
Add children fo traverse callback
2017-04-05 12:31:19 -03:00
Ludovic Stephan
f57c292184
Rename history var
2017-04-05 12:13:24 -03:00
Ludovic Stephan
508e7ec23f
Change traverse and find behavior
2017-04-05 12:00:39 -03:00
Ludovic Stephan
88f7ea941d
Move selection logic to another class
2017-04-05 11:26:33 -03:00
Ludovic Stephan
8d13c0a4bb
Add fetch method
2017-04-05 10:59:59 -03:00
Aurélien Delobelle
ebf948d042
Merge branch 'qwann/k-fet/category_addcost' into 'master'
...
K-Fêt - Majorations
- Seulement les catégories préalablement sélectionnées sont majorées le
le cas échéant.
- Pour modifier cette sélection, suivre le lien "Catégories" depuis la
liste des articles.
Fixes #149
See merge request !189
2017-04-05 15:52:15 +02:00
Aurélien Delobelle
3ee9de93d9
few improvements on article category
...
- add verbose names to ArticleCategory fields
- add button to view categories list from articles list
- fix article_update template in form validation
- improve interface for articlecategory_update
- revert vanished urls (happened in merge with master...)
2017-04-05 15:34:28 +02:00
Ludovic Stephan
290d4ecb6e
Merge branch 'Aufinal/refactor_articles' into Aufinal/refactor_history
2017-04-05 10:03:30 -03:00
Aurélien Delobelle
42728e58be
Merge branch 'master' into qwann/k-fet/category_addcost
2017-04-05 14:57:26 +02:00
Ludovic Stephan
7ec7ed2696
Rename History class
2017-04-05 09:53:12 -03:00
Ludovic Stephan
e051631a34
Use WebSocket classes
2017-04-05 09:28:32 -03:00
Ludovic Stephan
360c442a4e
Remove useless class
2017-04-05 09:24:27 -03:00
Ludovic Stephan
1761c5f1bd
Change fromAPI logic
2017-04-05 09:13:00 -03:00
Ludovic Stephan
840010b63f
Merge remote-tracking branch 'origin/aureplop/kpsul_js_refactor' into Aufinal/refactor_articles
2017-04-05 09:03:59 -03:00
Ludovic Stephan
a29de134f1
Move focus ; move is_low_stock to method
2017-04-05 08:58:46 -03:00
Aurélien Delobelle
2e0de75471
kpsul - fix account balance ukf
2017-04-05 13:18:01 +02:00
Aurélien Delobelle
6bb9280b0d
Merge branch 'aureplop/clean_js' into 'aureplop/kpsul_js_refactor'
...
Enhance APIModelObject
See merge request !213
2017-04-05 04:30:34 +02:00
Aurélien Delobelle
6be6202b3f
few cleans
2017-04-05 04:26:50 +02:00
Aurélien Delobelle
f1aaad7317
Better jquery ajax calls management
...
It becomes the same as the original jQuery ajax object.
For example, callbacks can be queued.
get_by_apipk and from_API of ModelObject returns the ajax object.
Example (js):
Account.get_by_apipk('AAA')
.done(function (data) {
console.log(data)
})
.fail( () => console.log('cool') )
...
.done( ...
2017-04-05 04:05:31 +02:00
Aurélien Delobelle
efbcde163b
clean some js
...
- clean buttons code on account and checkout
- merge CheckoutRead and kpsul_checkout_data views (the first won)
APIModelObject interface
- add url_create, url_update, url_update_for
- rename url_object_for and url_object to url_read_for and url_read
2017-04-05 03:43:51 +02:00
Ludovic Stephan
3b9affb3f3
Add focus methods
2017-04-04 20:18:53 -03:00
Ludovic Stephan
9c559d9ec3
Add articles reset to kpsul.reset
2017-04-04 19:54:03 -03:00
Ludovic Stephan
021937a38e
Small bugfixes
2017-04-04 19:52:12 -03:00
Martin Pépin
a262983170
PEP8 compliance in bda.views
2017-04-04 23:51:22 +01:00
Ludovic Stephan
cb28b928c4
Remove articleSelect from _env
2017-04-04 19:42:30 -03:00
Martin Pepin
fe66a6ef6b
Merge branch 'aureplop/fix_stats' into 'master'
...
Stats K-Fêt - Python side
See merge request !208
2017-04-05 00:41:47 +02:00
Ludovic Stephan
e5791efe4d
Remove last traces of old articles
2017-04-04 19:41:15 -03:00
Ludovic Stephan
05156f37c6
Update addExistingPurchase
2017-04-04 19:34:22 -03:00
