Skip to content

Commit

Permalink
oe- discount based on amount (#82)
Browse files Browse the repository at this point in the history
* Non admin can create more than one shop (#73)

* #71 non admin user can create more than one shop

* #71 non admin user can create more than one shop

* #71 non admin user can create more than one shop

* enhance auth functions

* #71 non admin user can create more than one shop

* #69 validate fields for discount

* #72 starting with precaching

* #71 fix issue with shop validation

* initial implementation for discount

* #69 implement the order process that include discounts

* #69 better validation for discount value

* fix typo error

* make our participation lower

* make our participation lower for stripe

* #69 fix issue on fees calculation

* #69 fix issue on fees calculation

* accept more photos on this shops

* upgrade node vm

* accept image gallery

* #69 better bill layout

* #69 validate report with real e2e data from production

* support mongodb 3.2 on travis

* use a npm dep badge

* debug travis issue

* fix issue for duplicate creation

* resolve travis issue

* use mongo 3.0

* #69 remove useless log

* sort should work on disk when high memory usage

* open 1218

* fix allowDiskUse criteria on aggregate

* #69 fix issue with orders counting

* #69 orders counting was not good

* #69 orders counting was not good

* missing issue label

* #80 remove ability for user to modify his shops and payments from update method

* #80 remove ability for user to modify his shops and payments from update method

* #69 lot of fixes after e2e testing. Big one, was the payment fees was not stored in db

* on delete payment error we trace the payment data

* #69 fix issue with product selection for the next shipping

* #69 select product is not working well

* #69 small fixes

* #69 small fixes

* #69 first step to test email after new order
  • Loading branch information
evaletolab authored Nov 12, 2016
1 parent b0ff40f commit 2b4c515
Show file tree
Hide file tree
Showing 37 changed files with 6,358 additions and 485 deletions.
15 changes: 14 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
language: node_js
node_js:
- "0.10"
- "4.2.6"

services:
- mongodb

sudo: false

addons:
apt:
sources:
- mongodb-upstart
- mongodb-3.0-precise
packages:
- mongodb-org-server
- mongodb-org-shell

env:
- NODE_ENV="test"

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Karibou-api
Karibou is an open-source project aim to help the creation of an
Karibou.ch is an open-source project aim to help the creation of an
online community marketplace. Our goal is to allow local food producers, artisans and artists
to sell their products locally. There is alpha frontend available here http://karibou.evaletolab.ch/

[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/evaletolab/karibou-api/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
![NPM](https://david-dm.org/evaletolab/karibou-api.svg)
[![Build Status](https://travis-ci.org/evaletolab/karibou-api.svg?branch=master)](https://travis-ci.org/evaletolab/karibou-api)

## Getting started
Expand Down
15 changes: 8 additions & 7 deletions config/config-shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ module.exports = {
hypercenter:11.9,
periphery:14.90
}, // shipping price
priceA:2,
priceB:3,
periphery:["1212","1213","1219","1223","1224","1225","1226","1228","1231","1232","1233","1234","1253","1255","1256","1257","1258"]
priceA:0,
priceB:0,
periphery:["1212","1213","1218","1219","1223","1224","1225","1226","1228","1231","1232","1233","1234","1253","1255","1256","1257","1258"]
},

issue:{
Expand All @@ -43,6 +43,7 @@ module.exports = {
"issue_missing_validation",
"issue_missing_customer_support",
"issue_wrong_packing",
"issue_wrong_product",
"issue_wrong_client_id",
"issue_wrong_product_quality",
"issue_late_delivry"
Expand All @@ -64,7 +65,7 @@ module.exports = {
location:{
list:[
"1201","1202","1203","1204","1205","1206","1207","1208","1209","1227",
"1212","1213","1219","1223","1224","1225","1226","1228","1231","1232","1233","1234","1253","1255","1256","1257","1258"]
"1212","1213","1218","1219","1223","1224","1225","1226","1228","1231","1232","1233","1234","1253","1255","1256","1257","1258"]
},
region:{
list:["Genève", "Carouge,GE"]
Expand Down Expand Up @@ -125,9 +126,9 @@ module.exports = {
cancelreason:["customer", "fraud", "inventory", "system","timeout","other"],
status:["failure","created","reserved","partial","fulfilled"],
gateway:[
{label:"postfinance card",fees:0.00},
{label:"american express",fees:0.00},
{label:"visa",fees:0.000},
{label:"postfinance card",fees:0.0},
{label:"american express",fees:0.01},
{label:"visa",fees:0.00},
{label:"mastercard",fees:0.0},
{label:"wallet", fees:0.000},
{label:"invoice",fees:0.000},
Expand Down
Loading

0 comments on commit 2b4c515

Please sign in to comment.